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 [8/20] -
/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag7.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag7.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag7.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag7.jsp Fri Feb 10 13:08:44 2006
@@ -1,5 +1,5 @@
<%@ 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" %>
@@ -10,7 +10,9 @@
<html:image srcKey="default.testing.image" accesskey="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" accesskey="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ accesskey="XXX">
</bean:define>
</logic:equal>
@@ -20,7 +22,9 @@
<html:image srcKey="default.testing.image" align="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" align="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ align="XXX">
</bean:define>
</logic:equal>
@@ -30,45 +34,59 @@
<html:image srcKey="default.testing.image" alt="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" alt="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ alt="XXX">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyAltKeyDefaultBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" altKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" alt="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyAltKeyAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>" alt="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyAltKeyDefaultBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" altKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>" alt="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyAltKeyAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>" alt="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
@@ -78,7 +96,9 @@
<html:image srcKey="default.testing.image" border="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" border="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ border="XXX">
</bean:define>
</logic:equal>
@@ -88,7 +108,9 @@
<html:image srcKey="default.testing.image" disabled="true"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" disabled="disabled">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ disabled="disabled">
</bean:define>
</logic:equal>
@@ -98,7 +120,9 @@
<html:image srcKey="default.testing.image" disabled="True"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" disabled="disabled">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ disabled="disabled">
</bean:define>
</logic:equal>
@@ -108,7 +132,9 @@
<html:image srcKey="default.testing.image" disabled="TRUE"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" disabled="disabled">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ disabled="disabled">
</bean:define>
</logic:equal>
@@ -118,7 +144,8 @@
<html:image srcKey="default.testing.image" disabled="false"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
</bean:define>
</logic:equal>
@@ -128,7 +155,8 @@
<html:image srcKey="default.testing.image" disabled="False"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
</bean:define>
</logic:equal>
@@ -138,47 +166,60 @@
<html:image srcKey="default.testing.image" disabled="FALSE"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyLocaleDefaultBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" locale="secret locale" altKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image" locale="secret locale"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" alt="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyLocaleAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" locale="secret locale" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image" locale="secret locale"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>" alt="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyLocaleDefaultBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" locale="secret locale" altKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image" locale="secret locale"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>" alt="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyLocaleAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" locale="secret locale" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image" locale="secret locale"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>" alt="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
@@ -188,7 +229,9 @@
<html:image srcKey="default.testing.image" onblur="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onblur="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onblur="XXX">
</bean:define>
</logic:equal>
@@ -198,7 +241,9 @@
<html:image srcKey="default.testing.image" onchange="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onchange="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onchange="XXX">
</bean:define>
</logic:equal>
@@ -208,7 +253,9 @@
<html:image srcKey="default.testing.image" onclick="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onclick="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onclick="XXX">
</bean:define>
</logic:equal>
@@ -218,7 +265,9 @@
<html:image srcKey="default.testing.image" ondblclick="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" ondblclick="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ ondblclick="XXX">
</bean:define>
</logic:equal>
@@ -228,7 +277,9 @@
<html:image srcKey="default.testing.image" onfocus="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onfocus="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onfocus="XXX">
</bean:define>
</logic:equal>
@@ -238,7 +289,9 @@
<html:image srcKey="default.testing.image" onkeydown="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onkeydown="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onkeydown="XXX">
</bean:define>
</logic:equal>
@@ -248,7 +301,9 @@
<html:image srcKey="default.testing.image" onkeypress="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onkeypress="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onkeypress="XXX">
</bean:define>
</logic:equal>
@@ -258,23 +313,25 @@
<html:image srcKey="default.testing.image" onkeyup="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onkeyup="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onkeyup="XXX">
</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("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_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("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
-
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag8.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag8.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag8.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag8.jsp Fri Feb 10 13:08:44 2006
@@ -1,5 +1,5 @@
<%@ 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" %>
@@ -10,7 +10,9 @@
<html:image srcKey="default.testing.image" onmousedown="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onmousedown="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onmousedown="XXX">
</bean:define>
</logic:equal>
@@ -20,7 +22,9 @@
<html:image srcKey="default.testing.image" onmousemove="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onmousemove="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onmousemove="XXX">
</bean:define>
</logic:equal>
@@ -30,7 +34,9 @@
<html:image srcKey="default.testing.image" onmouseout="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onmouseout="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onmouseout="XXX">
</bean:define>
</logic:equal>
@@ -40,7 +46,9 @@
<html:image srcKey="default.testing.image" onmouseover="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onmouseover="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onmouseover="XXX">
</bean:define>
</logic:equal>
@@ -50,7 +58,9 @@
<html:image srcKey="default.testing.image" onmouseup="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" onmouseup="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ onmouseup="XXX">
</bean:define>
</logic:equal>
@@ -60,7 +70,8 @@
<html:image srcKey="default.testing.image" property=""/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
</bean:define>
</logic:equal>
@@ -70,7 +81,9 @@
<html:image srcKey="default.testing.image" style="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" style="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ style="XXX">
</bean:define>
</logic:equal>
@@ -80,7 +93,9 @@
<html:image srcKey="default.testing.image" styleClass="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" class="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ class="XXX">
</bean:define>
</logic:equal>
@@ -90,7 +105,9 @@
<html:image srcKey="default.testing.image" styleId="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" id="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ id="XXX">
</bean:define>
</logic:equal>
@@ -100,7 +117,9 @@
<html:image srcKey="default.testing.image" tabindex="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" tabindex="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ tabindex="XXX">
</bean:define>
</logic:equal>
@@ -110,47 +129,61 @@
<html:image srcKey="default.testing.image" title="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" title="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ title="XXX">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyTitleKeyDefaultBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" titleKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image"
+ titleKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" title="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ title="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyTitleKeyAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" titleKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image"
+ titleKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>" title="Testing Message">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/alternate/myimage.gif")%>"
+ title="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyTitleKeyDefaultBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="default.testing.image" titleKey="default.bundle.message"/>
+ <html:image srcKey="default.testing.image"
+ titleKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>" title="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/default/myimage.gif")%>"
+ title="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyTitleKeyAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:image srcKey="alternate.testing.image" titleKey="alternate.bundle.message" bundle="alternate"/>
+ <html:image srcKey="alternate.testing.image"
+ titleKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>" title="Message D'Essai">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/fr/alternate/myimage.gif")%>"
+ title="Message D'Essai">
</bean:define>
</logic:equal>
@@ -160,109 +193,117 @@
<html:image srcKey="default.testing.image" value="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <input type="image" name="" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>" value="XXX">
+ <input type="image" name=""
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>"
+ value="XXX">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedArray">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedArrayProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="list">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="list">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedMap">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedMapProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="map">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="map">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedEnumeration">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- <input type="image" name="[1]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ <input type="image" name="[1]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImageSrcKeyIndexedEnumerationProperty">
- <bean:define id="TEST_RESULTS" toScope="page">
- <logic:iterate id="indivItem" name="lst" property="enumeration">
- <html:image srcKey="default.testing.image" indexed="true"/>
- </logic:iterate>
- </bean:define>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
-
- <input type="image" name="[0]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- <input type="image" name="[1]" src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
-
- </bean:define>
-</logic:equal>
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <logic:iterate id="indivItem" name="lst" property="enumeration">
+ <html:image srcKey="default.testing.image" indexed="true"/>
+ </logic:iterate>
+ </bean:define>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <input type="image" name="[0]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ <input type="image" name="[1]"
+ src="<%=response.encodeURL("/images/default/default/myimage.gif")%>">
+
+ </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("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_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("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,5 +1,5 @@
<%@ 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" %>
@@ -10,7 +10,8 @@
<html:img page="/some/image.gif" align="left"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="left">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="left">
</bean:define>
</logic:equal>
@@ -19,7 +20,8 @@
<html:img page="/some/image.gif" align="right"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="right">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="right">
</bean:define>
</logic:equal>
@@ -28,7 +30,8 @@
<html:img page="/some/image.gif" align="top"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="top">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="top">
</bean:define>
</logic:equal>
@@ -37,7 +40,8 @@
<html:img page="/some/image.gif" align="middle"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="middle">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="middle">
</bean:define>
</logic:equal>
@@ -46,7 +50,8 @@
<html:img page="/some/image.gif" align="bottom"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="bottom">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="bottom">
</bean:define>
</logic:equal>
@@ -55,7 +60,8 @@
<html:img page="/some/image.gif" align="texttop"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="texttop">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="texttop">
</bean:define>
</logic:equal>
@@ -64,7 +70,8 @@
<html:img page="/some/image.gif" align="absmiddle"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="absmiddle">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="absmiddle">
</bean:define>
</logic:equal>
@@ -73,7 +80,8 @@
<html:img page="/some/image.gif" align="absbottom"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="absbottom">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="absbottom">
</bean:define>
</logic:equal>
@@ -82,7 +90,8 @@
<html:img page="/some/image.gif" align="any value"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="any value">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="any value">
</bean:define>
</logic:equal>
@@ -91,7 +100,8 @@
<html:img page="/some/image.gif" align="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" align="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ align="XXX">
</bean:define>
</logic:equal>
@@ -100,7 +110,8 @@
<html:img page="/some/image.gif" alt="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="XXX">
</bean:define>
</logic:equal>
@@ -109,16 +120,19 @@
<html:img page="/some/image.gif" altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageAltKeyAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img page="/some/image.gif" altKey="alternate.bundle.message"
+ bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
@@ -127,16 +141,19 @@
<html:img page="/some/image.gif" altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageAltKeyAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img page="/some/image.gif" altKey="alternate.bundle.message"
+ bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
@@ -145,7 +162,8 @@
<html:img page="/some/image.gif" border="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" border="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ border="XXX">
</bean:define>
</logic:equal>
@@ -154,7 +172,8 @@
<html:img page="/some/image.gif" height="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" height="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ height="15">
</bean:define>
</logic:equal>
@@ -163,7 +182,8 @@
<html:img page="/some/image.gif" height="155px"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" height="155px">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ height="155px">
</bean:define>
</logic:equal>
@@ -172,7 +192,8 @@
<html:img page="/some/image.gif" hspace="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" hspace="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ hspace="15">
</bean:define>
</logic:equal>
@@ -181,7 +202,8 @@
<html:img page="/some/image.gif" imageName="nameOfImage"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" name="nameOfImage">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ name="nameOfImage">
</bean:define>
</logic:equal>
@@ -190,33 +212,36 @@
<html:img page="/some/image.gif" ismap="nameOfMap"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" ismap="nameOfMap">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ ismap="nameOfMap">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageLocale">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" locale="secret locale" altKey="default.bundle.message"/>
+ <html:img page="/some/image.gif" locale="secret locale"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ alt="Message D'Essai">
</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("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_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("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1a.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1a.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1a.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag1a.jsp Fri Feb 10 13:08:44 2006
@@ -1,103 +1,114 @@
<%@ 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="testImgPageNameNoScope">
- <bean:define id="TEST_RESULTS" toScope="page">
+ <bean:define id="TEST_RESULTS" toScope="page">
<html:img page="/some/image.gif" name="paramMapNoScope"/>
- </bean:define>
- <bean:define id="thisMap1" name="paramMapNoScope" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
+ </bean:define>
+ <bean:define id="thisMap1" name="paramMapNoScope" type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNamePropertyNoScope">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" name="paramPropertyMapNoScope" property="map"/>
- </bean:define>
- <bean:define id="thisMap2" name="paramPropertyMapNoScope" property="map" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:img page="/some/image.gif" name="paramPropertyMapNoScope"
+ property="map"/>
+ </bean:define>
+ <bean:define id="thisMap2" name="paramPropertyMapNoScope" property="map"
+ type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNameApplicationScope">
- <bean:define id="TEST_RESULTS" toScope="page">
+ <bean:define id="TEST_RESULTS" toScope="page">
<html:img page="/some/image.gif" name="paramMapApplicationScope"/>
- </bean:define>
- <bean:define id="thisMap1" name="paramMapApplicationScope" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
+ </bean:define>
+ <bean:define id="thisMap1" name="paramMapApplicationScope"
+ type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNamePropertyApplicationScope">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" name="paramPropertyMapApplicationScope" property="map"/>
- </bean:define>
- <bean:define id="thisMap2" name="paramPropertyMapApplicationScope" property="map" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:img page="/some/image.gif"
+ name="paramPropertyMapApplicationScope" property="map"/>
+ </bean:define>
+ <bean:define id="thisMap2" name="paramPropertyMapApplicationScope"
+ property="map" type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNameSessionScope">
- <bean:define id="TEST_RESULTS" toScope="page">
+ <bean:define id="TEST_RESULTS" toScope="page">
<html:img page="/some/image.gif" name="paramMapSessionScope"/>
- </bean:define>
- <bean:define id="thisMap1" name="paramMapSessionScope" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
+ </bean:define>
+ <bean:define id="thisMap1" name="paramMapSessionScope"
+ type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNamePropertySessionScope">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" name="paramPropertyMapSessionScope" property="map"/>
- </bean:define>
- <bean:define id="thisMap2" name="paramPropertyMapSessionScope" property="map" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:img page="/some/image.gif" name="paramPropertyMapSessionScope"
+ property="map"/>
+ </bean:define>
+ <bean:define id="thisMap2" name="paramPropertyMapSessionScope"
+ property="map" type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNameRequestScope">
- <bean:define id="TEST_RESULTS" toScope="page">
+ <bean:define id="TEST_RESULTS" toScope="page">
<html:img page="/some/image.gif" name="paramMapRequestScope"/>
- </bean:define>
- <bean:define id="thisMap1" name="paramMapRequestScope" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
+ </bean:define>
+ <bean:define id="thisMap1" name="paramMapRequestScope"
+ type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap1, null, false)%>">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageNamePropertyRequestScope">
- <bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" name="paramPropertyMapRequestScope" property="map"/>
- </bean:define>
- <bean:define id="thisMap2" name="paramPropertyMapRequestScope" property="map" type="java.util.Map"/>
- <bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
+ <bean:define id="TEST_RESULTS" toScope="page">
+ <html:img page="/some/image.gif" name="paramPropertyMapRequestScope"
+ property="map"/>
+ </bean:define>
+ <bean:define id="thisMap2" name="paramPropertyMapRequestScope"
+ property="map" type="java.util.Map"/>
+ <bean:define id="EXPECTED_RESULTS" toScope="page">
+ <img src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, "/some/image.gif", null, null, thisMap2, null, false)%>">
</bean:define>
</logic:equal>
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new javax.servlet.jsp.JspException
- ("No tests on this page were called. Please verify that you've setup the tests correctly.");
-}else{
- expected=pageContext.getAttribute("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
+<%
+ String expected = "";
+ String compareTo = "";
+
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ throw new javax.servlet.jsp.JspException
+ ("No tests on this page were called. Please verify that you've setup the tests correctly.");
+ } else {
+ expected = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag2.jsp Fri Feb 10 13:08:44 2006
@@ -1,5 +1,5 @@
<%@ 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" %>
@@ -10,7 +10,8 @@
<html:img page="/some/image.gif" onclick="onclick"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onclick="onclick">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onclick="onclick">
</bean:define>
</logic:equal>
@@ -19,7 +20,8 @@
<html:img page="/some/image.gif" ondblclick="ondblclick"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" ondblclick="ondblclick">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ ondblclick="ondblclick">
</bean:define>
</logic:equal>
@@ -28,7 +30,8 @@
<html:img page="/some/image.gif" onkeydown="onkeydown"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onkeydown="onkeydown">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onkeydown="onkeydown">
</bean:define>
</logic:equal>
@@ -37,7 +40,8 @@
<html:img page="/some/image.gif" onkeypress="onkeypress"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onkeypress="onkeypress">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onkeypress="onkeypress">
</bean:define>
</logic:equal>
@@ -46,7 +50,8 @@
<html:img page="/some/image.gif" onkeyup="onkeyup"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onkeyup="onkeyup">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onkeyup="onkeyup">
</bean:define>
</logic:equal>
@@ -56,7 +61,8 @@
<html:img page="/some/image.gif" onmousedown="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onmousedown="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onmousedown="XXX">
</bean:define>
</logic:equal>
@@ -66,7 +72,8 @@
<html:img page="/some/image.gif" onmousemove="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onmousemove="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onmousemove="XXX">
</bean:define>
</logic:equal>
@@ -76,7 +83,8 @@
<html:img page="/some/image.gif" onmouseout="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onmouseout="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onmouseout="XXX">
</bean:define>
</logic:equal>
@@ -86,7 +94,8 @@
<html:img page="/some/image.gif" onmouseover="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onmouseover="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onmouseover="XXX">
</bean:define>
</logic:equal>
@@ -96,7 +105,8 @@
<html:img page="/some/image.gif" onmouseup="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" onmouseup="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ onmouseup="XXX">
</bean:define>
</logic:equal>
@@ -106,7 +116,8 @@
<html:img page="/some/image.gif" style="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" style="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ style="XXX">
</bean:define>
</logic:equal>
@@ -116,7 +127,8 @@
<html:img page="/some/image.gif" styleClass="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" class="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ class="XXX">
</bean:define>
</logic:equal>
@@ -126,7 +138,8 @@
<html:img page="/some/image.gif" styleId="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" id="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ id="XXX">
</bean:define>
</logic:equal>
@@ -136,7 +149,8 @@
<html:img page="/some/image.gif" title="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" title="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ title="XXX">
</bean:define>
</logic:equal>
@@ -146,17 +160,20 @@
<html:img page="/some/image.gif" titleKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" title="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ title="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageTitleKeyAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img page="/some/image.gif" titleKey="alternate.bundle.message"
+ bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" title="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ title="Testing Message">
</bean:define>
</logic:equal>
@@ -166,16 +183,19 @@
<html:img page="/some/image.gif" titleKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" title="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ title="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageTitleKeyAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img page="/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img page="/some/image.gif" titleKey="alternate.bundle.message"
+ bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" title="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ title="Message D'Essai">
</bean:define>
</logic:equal>
@@ -184,7 +204,8 @@
<html:img page="/some/image.gif" usemap="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" usemap="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ usemap="XXX">
</bean:define>
</logic:equal>
@@ -193,7 +214,8 @@
<html:img page="/some/image.gif" vspace="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" vspace="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ vspace="15">
</bean:define>
</logic:equal>
@@ -203,26 +225,25 @@
<html:img page="/some/image.gif" width="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>" width="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/some/image.gif")%>"
+ width="15">
</bean:define>
</logic:equal>
+<%
+ String expected = "";
+ String compareTo = "";
+ if (pageContext.getAttribute("EXPECTED_RESULTS") == null) {
+ throw new javax.servlet.jsp.JspException
+ ("No tests on this page were called. Please verify that you've setup the tests correctly.");
+ } else {
+ expected = pageContext.getAttribute("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_RESULTS").toString();
+ }
-<%
-String expected = "";
-String compareTo = "";
-
-if (pageContext.getAttribute("EXPECTED_RESULTS") == null){
- throw new javax.servlet.jsp.JspException
- ("No tests on this page were called. Please verify that you've setup the tests correctly.");
-}else{
- expected=pageContext.getAttribute("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_RESULTS").toString();
-}
-
-Assert.assertEquals(expected, compareTo);
+ Assert.assertEquals(expected, compareTo);
%>
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag3.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag3.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag3.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImgTag3.jsp Fri Feb 10 13:08:44 2006
@@ -1,5 +1,5 @@
<%@ 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" %>
@@ -10,7 +10,8 @@
<html:img pageKey="default.testing.image" align="left"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="left">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="left">
</bean:define>
</logic:equal>
@@ -19,7 +20,8 @@
<html:img pageKey="default.testing.image" align="right"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="right">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="right">
</bean:define>
</logic:equal>
@@ -28,7 +30,8 @@
<html:img pageKey="default.testing.image" align="top"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="top">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="top">
</bean:define>
</logic:equal>
@@ -37,7 +40,8 @@
<html:img pageKey="default.testing.image" align="middle"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="middle">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="middle">
</bean:define>
</logic:equal>
@@ -46,7 +50,8 @@
<html:img pageKey="default.testing.image" align="bottom"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="bottom">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="bottom">
</bean:define>
</logic:equal>
@@ -55,7 +60,8 @@
<html:img pageKey="default.testing.image" align="texttop"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="texttop">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="texttop">
</bean:define>
</logic:equal>
@@ -64,7 +70,8 @@
<html:img pageKey="default.testing.image" align="absmiddle"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="absmiddle">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="absmiddle">
</bean:define>
</logic:equal>
@@ -73,7 +80,8 @@
<html:img pageKey="default.testing.image" align="absbottom"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="absbottom">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="absbottom">
</bean:define>
</logic:equal>
@@ -82,7 +90,8 @@
<html:img pageKey="default.testing.image" align="any value"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="any value">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="any value">
</bean:define>
</logic:equal>
@@ -91,7 +100,8 @@
<html:img pageKey="default.testing.image" align="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" align="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ align="XXX">
</bean:define>
</logic:equal>
@@ -100,43 +110,52 @@
<html:img pageKey="default.testing.image" alt="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" alt="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ alt="XXX">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageKeyAltKeyDefaultBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img pageKey="default.testing.image" altKey="default.bundle.message"/>
+ <html:img pageKey="default.testing.image"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" alt="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageKeyAltKeyAlternateBundle">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img pageKey="alternate.testing.image" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img pageKey="alternate.testing.image"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/alternate/myimage.gif")%>" alt="Testing Message">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/alternate/myimage.gif")%>"
+ alt="Testing Message">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageKeyAltKeyDefaultBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img pageKey="default.testing.image" altKey="default.bundle.message"/>
+ <html:img pageKey="default.testing.image"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/default/myimage.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/default/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageKeyAltKeyAlternateBundle_fr">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img pageKey="alternate.testing.image" altKey="alternate.bundle.message" bundle="alternate"/>
+ <html:img pageKey="alternate.testing.image"
+ altKey="alternate.bundle.message" bundle="alternate"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/alternate/myimage.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/alternate/myimage.gif")%>"
+ alt="Message D'Essai">
</bean:define>
</logic:equal>
@@ -145,7 +164,8 @@
<html:img pageKey="default.testing.image" border="XXX"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" border="XXX">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ border="XXX">
</bean:define>
</logic:equal>
@@ -154,7 +174,8 @@
<html:img pageKey="default.testing.image" height="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" height="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ height="15">
</bean:define>
</logic:equal>
@@ -163,7 +184,8 @@
<html:img pageKey="default.testing.image" height="155px"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" height="155px">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ height="155px">
</bean:define>
</logic:equal>
@@ -172,7 +194,8 @@
<html:img pageKey="default.testing.image" hspace="15"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" hspace="15">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ hspace="15">
</bean:define>
</logic:equal>
@@ -181,7 +204,8 @@
<html:img pageKey="default.testing.image" imageName="nameOfImage"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" name="nameOfImage">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ name="nameOfImage">
</bean:define>
</logic:equal>
@@ -190,32 +214,35 @@
<html:img pageKey="default.testing.image" ismap="nameOfMap"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>" ismap="nameOfMap">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/default/default/myimage.gif")%>"
+ ismap="nameOfMap">
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testImgPageKeyLocale">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:img pageKey="default.testing.image" locale="secret locale" altKey="default.bundle.message"/>
+ <html:img pageKey="default.testing.image" locale="secret locale"
+ altKey="default.bundle.message"/>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/default/myimage.gif")%>" alt="Message D'Essai">
+ <img src="<%=response.encodeURL( request.getContextPath() + "/images/fr/default/myimage.gif")%>"
+ alt="Message D'Essai">
</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("TEST_RESULTS").toString();
-}
-if (pageContext.getAttribute("TEST_RESULTS") != null){
- compareTo=pageContext.getAttribute("EXPECTED_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("TEST_RESULTS").toString();
+ }
+ if (pageContext.getAttribute("TEST_RESULTS") != null) {
+ compareTo = pageContext.getAttribute("EXPECTED_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