You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/10 22:08:50 UTC
svn commit: r376852 [11/20] -
/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag5.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag5.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag5.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag5.jsp Fri Feb 10 13:08:44 2006
@@ -1,7 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@page import="org.apache.struts.util.RequestUtils"%>
-<%@page import="java.util.HashMap"%>
+<%@ 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" %>
@@ -12,7 +10,8 @@
<html:link href="/some/page.do">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
@@ -21,7 +20,8 @@
<html:link href="/some/page.do" accesskey="XXX">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" accesskey="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ accesskey="XXX">Test Link</a>
</bean:define>
</logic:equal>
@@ -31,179 +31,205 @@
<html:link href="/some/page.do" anchor="XXX">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do#XXX", null, null, null, null, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do#XXX", null, null, null, null, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedArray">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedArrayProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedMap">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedMapProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedEnumeration">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=1", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=1", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedEnumerationProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:link href="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=1", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:link href="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?index=1", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
+<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdArray">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+ </bean:define>
+</logic:equal>
+<logic:equal name="runTest"
+ value="testLinkHrefIndexedAlternateIdArrayProperty">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
-<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdArray">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdArrayProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdMap">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdMapProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdEnumeration">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=1", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testLinkHrefIndexedAlternateIdEnumerationProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:link href="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=1", null, null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=1", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testLinkHrefIndexedAlternateIdEnumerationProperty">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:link href="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=0", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do?alternateId=1", null, null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefLinkName">
@@ -216,97 +242,114 @@
</logic:equal>
-
-
-
<logic:equal name="runTest" value="testLinkHrefNameNoScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
<html:link href="/some/page.do" name="paramMap">Test Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNamePropertyNoScope">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramPropertyMap" property="map">Test Link</html:link>
- </bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
- <bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <html:link href="/some/page.do" name="paramPropertyMap"
+ property="map">Test Link</html:link>
+ </bean:define>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNameApplicationScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramMap" scope="application">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramMap" scope="application">
+ Test Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNamePropertyApplicationScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramPropertyMap" property="map" scope="application">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramPropertyMap" property="map"
+ scope="application">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNameSessionScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramMap" scope="session">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramMap" scope="session">Test
+ Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNamePropertySessionScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramPropertyMap" property="map" scope="session">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramPropertyMap" property="map"
+ scope="session">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNameRequestScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramMap" scope="request">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramMap" scope="request">Test
+ Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefNamePropertyRequestScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" name="paramPropertyMap" property="map" scope="request">Test Link</html:link>
+ <html:link href="/some/page.do" name="paramPropertyMap" property="map"
+ scope="request">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
-<%
-String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+<%
+ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+ String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+ if ((expected == null) || (compareTo == null)) {
+ Assert.fail(
+ "An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
+ }
-if ((expected == null) || (compareTo == null)){
- Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
-}
-
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag6.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag6.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag6.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag6.jsp Fri Feb 10 13:08:44 2006
@@ -1,7 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@page import="org.apache.struts.util.RequestUtils"%>
-<%@page import="java.util.HashMap"%>
+<%@ 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" %>
@@ -11,203 +9,241 @@
<html:link href="/some/page.do" onblur="onblur">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onblur="onblur">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onblur="onblur">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnclick">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onclick="onclick">Test Link</html:link>
+ <html:link href="/some/page.do" onclick="onclick">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onclick="onclick">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onclick="onclick">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOndblclick">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" ondblclick="ondblclick">Test Link</html:link>
+ <html:link href="/some/page.do" ondblclick="ondblclick">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" ondblclick="ondblclick">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ ondblclick="ondblclick">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnfocus">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onfocus="onfocus">Test Link</html:link>
+ <html:link href="/some/page.do" onfocus="onfocus">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onfocus="onfocus">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onfocus="onfocus">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnkeydown">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onkeydown="onkeydown">Test Link</html:link>
+ <html:link href="/some/page.do" onkeydown="onkeydown">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onkeydown="onkeydown">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onkeydown="onkeydown">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnkeypress">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onkeypress="onkeypress">Test Link</html:link>
+ <html:link href="/some/page.do" onkeypress="onkeypress">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onkeypress="onkeypress">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onkeypress="onkeypress">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnkeyup">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onkeyup="onkeyup">Test Link</html:link>
+ <html:link href="/some/page.do" onkeyup="onkeyup">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onkeyup="onkeyup">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onkeyup="onkeyup">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnmousedown">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onmousedown="onmousedown">Test Link</html:link>
+ <html:link href="/some/page.do" onmousedown="onmousedown">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onmousedown="onmousedown">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onmousedown="onmousedown">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnmousemove">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onmousemove="onmousemove">Test Link</html:link>
+ <html:link href="/some/page.do" onmousemove="onmousemove">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onmousemove="onmousemove">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onmousemove="onmousemove">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnmouseout">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onmouseout="onmouseout">Test Link</html:link>
+ <html:link href="/some/page.do" onmouseout="onmouseout">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onmouseout="onmouseout">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onmouseout="onmouseout">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnmouseover">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onmouseover="onmouseover">Test Link</html:link>
+ <html:link href="/some/page.do" onmouseover="onmouseover">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onmouseover="onmouseover">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onmouseover="onmouseover">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefOnmouseup">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link href="/some/page.do" onmouseup="onmouseup">Test Link</html:link>
+ <html:link href="/some/page.do" onmouseup="onmouseup">Test
+ Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" onmouseup="onmouseup">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ onmouseup="onmouseup">Test Link</a>
</bean:define>
</logic:equal>
-
-
-
-
-
-
<logic:equal name="runTest" value="testLinkHrefParamIdParamNameNoScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam" paramName="paramName">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="paramName">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testLinkHrefParamIdParamNameParamPropertyNoScope">
+<logic:equal name="runTest"
+ value="testLinkHrefParamIdParamNameParamPropertyNoScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam"
- paramName="testingParamProperty" paramProperty="string">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="testingParamProperty" paramProperty="string">
+ Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testLinkHrefParamIdParamNameApplicationScope">
+<logic:equal name="runTest"
+ value="testLinkHrefParamIdParamNameApplicationScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam" paramName="paramName">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="paramName">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testLinkHrefParamIdParamNameParamPropertyApplicationScope">
+<logic:equal name="runTest"
+ value="testLinkHrefParamIdParamNameParamPropertyApplicationScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam"
- paramName="testingParamProperty" paramProperty="string">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="testingParamProperty" paramProperty="string">
+ Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefParamIdParamNameSessionScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam" paramName="paramName">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="paramName">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testLinkHrefParamIdParamNameParamPropertySessionScope">
+<logic:equal name="runTest"
+ value="testLinkHrefParamIdParamNameParamPropertySessionScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam"
- paramName="testingParamProperty" paramProperty="string">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="testingParamProperty" paramProperty="string">
+ Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefParamIdParamNameRequestScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam" paramName="paramName">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="paramName">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-<logic:equal name="runTest" value="testLinkHrefParamIdParamNameParamPropertyRequestScope">
+<logic:equal name="runTest"
+ value="testLinkHrefParamIdParamNameParamPropertyRequestScope">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" paramId="myParam"
- paramName="testingParamProperty" paramProperty="string">Test Link</html:link>
+ <html:link href="/some/page.do" paramId="myParam"
+ paramName="testingParamProperty" paramProperty="string">
+ Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?myParam=paramPropertyValue">Test
+ Link</a>
</bean:define>
</logic:equal>
-
<logic:equal name="runTest" value="testLinkHrefStyle">
<bean:define id="TEST_RESULTS" toScope="page">
<html:link href="/some/page.do" style="XXX">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" style="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ style="XXX">Test Link</a>
</bean:define>
</logic:equal>
@@ -217,7 +253,8 @@
<html:link href="/some/page.do" styleClass="XXX">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" class="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ class="XXX">Test Link</a>
</bean:define>
</logic:equal>
@@ -227,7 +264,8 @@
<html:link href="/some/page.do" styleId="XXX">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" id="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ id="XXX">Test Link</a>
</bean:define>
</logic:equal>
@@ -237,7 +275,8 @@
<html:link href="/some/page.do" tabindex="4">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" tabindex="4">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ tabindex="4">Test Link</a>
</bean:define>
</logic:equal>
@@ -247,7 +286,8 @@
<html:link href="/some/page.do" target="_new">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" target="_new">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ target="_new">Test Link</a>
</bean:define>
</logic:equal>
@@ -257,41 +297,44 @@
<html:link href="/some/page.do" title="XXX">Test Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" title="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ title="XXX">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefTitleKey">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" titleKey="default.bundle.message">Test Link</html:link>
+ <html:link href="/some/page.do" titleKey="default.bundle.message">Test
+ Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>" title="Testing Message">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>"
+ title="Testing Message">Test Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkHrefTransaction">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:link href="/some/page.do" transaction="true">Test Link</html:link>
+ <html:link href="/some/page.do" transaction="true">Test
+ Link</html:link>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?org.apache.struts.taglib.html.TOKEN=Some_Token_Here">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/some/page.do", null, null, null, null, null, false)%>?org.apache.struts.taglib.html.TOKEN=Some_Token_Here">Test
+ Link</a>
</bean:define>
</logic:equal>
+<%
+ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+ String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+ if ((expected == null) || (compareTo == null)) {
+ Assert.fail(
+ "An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
+ }
-
-<%
-String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
-
-if ((expected == null) || (compareTo == null)){
- Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
-}
-
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag7.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag7.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag7.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestLinkTag7.jsp Fri Feb 10 13:08:44 2006
@@ -1,7 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@page import="org.apache.struts.util.RequestUtils"%>
-<%@page import="java.util.HashMap"%>
+<%@ 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" %>
@@ -12,7 +10,8 @@
<html:link page="/some/page.do">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, null, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, null, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
@@ -21,7 +20,8 @@
<html:link page="/some/page.do" accesskey="XXX">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, null, null, false)%>" accesskey="XXX">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, null, null, false)%>"
+ accesskey="XXX">Test Link</a>
</bean:define>
</logic:equal>
@@ -31,179 +31,205 @@
<html:link page="/some/page.do" anchor="XXX">Test Link</html:link>
</bean:define>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do#XXX", null, null, null, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do#XXX", null, null, null, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedArray">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedArrayProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedMap">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedMapProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedEnumeration">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=1", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=1", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedEnumerationProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:link page="/some/page.do" indexed="true">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=1", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:link page="/some/page.do" indexed="true">Test
+ Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?index=1", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
+<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdArray">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
+ </bean:define>
+</logic:equal>
+<logic:equal name="runTest"
+ value="testLinkPageIndexedAlternateIdArrayProperty">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
-<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdArray">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdArrayProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdMap">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdMapProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdEnumeration">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=1", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
-</logic:equal>
-
-<logic:equal name="runTest" value="testLinkPageIndexedAlternateIdEnumerationProperty">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:link page="/some/page.do" indexed="true" indexId="alternateId">Test Link</html:link>
- </logic:iterate>
- </bean:define>
- <bean:define id="TEST_RESULTS" toScope="page">
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test Link</a>
-
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=1", null, null, null, null, false)%>">Test Link</a>
-
- </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=1", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
+</logic:equal>
+
+<logic:equal name="runTest"
+ value="testLinkPageIndexedAlternateIdEnumerationProperty">
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:link page="/some/page.do" indexed="true"
+ indexId="alternateId">Test Link</html:link>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=0", null, null, null, null, false)%>">Test
+ Link</a>
+
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do?alternateId=1", null, null, null, null, false)%>">Test
+ Link</a>
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageLinkName">
@@ -216,97 +242,114 @@
</logic:equal>
-
-
-
<logic:equal name="runTest" value="testLinkPageNameNoScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
<html:link page="/some/page.do" name="paramMap">Test Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNamePropertyNoScope">
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramPropertyMap" property="map">Test Link</html:link>
- </bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
- <bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <html:link page="/some/page.do" name="paramPropertyMap"
+ property="map">Test Link</html:link>
+ </bean:define>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNameApplicationScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramMap" scope="application">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramMap" scope="application">
+ Test Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNamePropertyApplicationScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramPropertyMap" property="map" scope="application">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramPropertyMap" property="map"
+ scope="application">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNameSessionScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramMap" scope="session">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramMap" scope="session">Test
+ Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNamePropertySessionScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramPropertyMap" property="map" scope="session">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramPropertyMap" property="map"
+ scope="session">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNameRequestScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramMap" scope="request">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramMap" scope="request">Test
+ Link</html:link>
</bean:define>
<bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testLinkPageNamePropertyRequestScope">
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <html:link page="/some/page.do" name="paramPropertyMap" property="map" scope="request">Test Link</html:link>
+ <html:link page="/some/page.do" name="paramPropertyMap" property="map"
+ scope="request">Test Link</html:link>
</bean:define>
- <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
+ <bean:define id="thisMap" name="paramPropertyMap" property="map"
+ type="java.util.Map"/>
<bean:define id="TEST_RESULTS" toScope="page">
- <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test Link</a>
+ <a href="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/page.do", null, null, thisMap, null, false)%>">Test
+ Link</a>
</bean:define>
</logic:equal>
-<%
-String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+<%
+ String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+ String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+ if ((expected == null) || (compareTo == null)) {
+ Assert.fail(
+ "An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
+ }
-if ((expected == null) || (compareTo == null)){
- Assert.fail("An invalid (or mispelled) test on this page was called. Please verify that you've setup the tests (and spellings) correctly.");
-}
-
-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