struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r376852 [5/20] - /struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/
Date Fri, 10 Feb 2006 21:08:50 GMT
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag1.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag1.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag1.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag1.jsp Fri Feb 10 13:08:44 2006
@@ -1,6 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
@@ -16,7 +15,6 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameForwardAnchor">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" anchor="XXX"/>
@@ -27,35 +25,35 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameForwardFrameborder">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" frameborder="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" frameborder="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               frameborder="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameForwardFrameName">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" frameName="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" name="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               name="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameForwardLongdesc">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" longdesc="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" longdesc="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               longdesc="XXX">
     </bean:define>
 </logic:equal>
 
@@ -65,18 +63,19 @@
         <html:frame forward="simpleForward" marginheight="15"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" marginheight="15">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               marginheight="15">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameForwardMarginwidth">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" marginwidth="10"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" marginwidth="10">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               marginwidth="10">
     </bean:define>
 </logic:equal>
 
@@ -87,38 +86,44 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameForwardNamePropertyNoScope">
-   <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" name="paramPropertyMap" property="map"/>
-   </bean:define>
-   <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
-   <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:frame forward="simpleForward" name="paramPropertyMap"
+                    property="map"/>
+    </bean:define>
+    <bean:define id="thisMap" name="paramPropertyMap" property="map"
+                 type="java.util.Map"/>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameForwardNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" name="paramMap" scope="application"/>
+        <html:frame forward="simpleForward" name="paramMap"
+                    scope="application"/>
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameForwardNamePropertyApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameForwardNamePropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" name="paramPropertyMap" property="map" scope="application"/>
+        <html:frame forward="simpleForward" name="paramPropertyMap"
+                    property="map" scope="application"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -128,17 +133,19 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameForwardNamePropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" name="paramPropertyMap" property="map" scope="session"/>
+        <html:frame forward="simpleForward" name="paramPropertyMap"
+                    property="map" scope="session"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -148,17 +155,19 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameForwardNamePropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" name="paramPropertyMap" property="map" scope="request"/>
+        <html:frame forward="simpleForward" name="paramPropertyMap"
+                    property="map" scope="request"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, "simpleForward", null, null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -168,7 +177,8 @@
         <html:frame forward="simpleForward" noresize="true"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -177,7 +187,8 @@
         <html:frame forward="simpleForward" noresize="True"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -218,13 +229,14 @@
 </logic:equal>
 
 
-<% 
-String expected  = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
-
-if ((expected == null) || (expected == 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);
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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);
 %>

Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag2.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag2.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag2.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag2.jsp Fri Feb 10 13:08:44 2006
@@ -1,102 +1,107 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
 
 <logic:equal name="runTest" value="testFrameForwardParamIdParamNameNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" paramName="paramName"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameParamPropertyNoScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameParamPropertyNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" paramName="paramName"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameParamPropertyApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameParamPropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameSessionScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameSessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" paramName="paramName"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameParamPropertySessionScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameParamPropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameRequestScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" paramName="paramName"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameForwardParamIdParamNameParamPropertyRequestScope">
+<logic:equal name="runTest"
+             value="testFrameForwardParamIdParamNameParamPropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame forward="simpleForward" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame forward="simpleForward" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-
-
-
-
-
-
 <logic:equal name="runTest" value="testFrameForwardScrolling1">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame forward="simpleForward" scrolling="yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="yes">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="yes">
     </bean:define>
 </logic:equal>
 
@@ -106,7 +111,8 @@
         <html:frame forward="simpleForward" scrolling="Yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="Yes">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="Yes">
     </bean:define>
 </logic:equal>
 
@@ -116,7 +122,8 @@
         <html:frame forward="simpleForward" scrolling="YES"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="YES">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="YES">
     </bean:define>
 </logic:equal>
 
@@ -126,7 +133,8 @@
         <html:frame forward="simpleForward" scrolling="no"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="no">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="no">
     </bean:define>
 </logic:equal>
 
@@ -136,7 +144,8 @@
         <html:frame forward="simpleForward" scrolling="No"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="No">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="No">
     </bean:define>
 </logic:equal>
 
@@ -146,7 +155,8 @@
         <html:frame forward="simpleForward" scrolling="NO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="NO">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="NO">
     </bean:define>
 </logic:equal>
 
@@ -156,7 +166,8 @@
         <html:frame forward="simpleForward" scrolling="auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="auto">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="auto">
     </bean:define>
 </logic:equal>
 
@@ -166,7 +177,8 @@
         <html:frame forward="simpleForward" scrolling="Auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="Auto">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="Auto">
     </bean:define>
 </logic:equal>
 
@@ -176,7 +188,8 @@
         <html:frame forward="simpleForward" scrolling="AUTO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="AUTO">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="AUTO">
     </bean:define>
 </logic:equal>
 
@@ -186,7 +199,8 @@
         <html:frame forward="simpleForward" scrolling="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" scrolling="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               scrolling="XXX">
     </bean:define>
 </logic:equal>
 
@@ -196,7 +210,8 @@
         <html:frame forward="simpleForward" style="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" style="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               style="XXX">
     </bean:define>
 </logic:equal>
 
@@ -206,26 +221,31 @@
         <html:frame forward="simpleForward" title="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" title="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               title="XXX">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameForwardTitleKey">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" titleKey="default.bundle.message"/>
+        <html:frame forward="simpleForward"
+                    titleKey="default.bundle.message"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" title="Testing Message">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               title="Testing Message">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameForwardTitleKeyAlt">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame forward="simpleForward" titleKey="alternate.bundle.message" bundle="alternate"/>
+        <html:frame forward="simpleForward"
+                    titleKey="alternate.bundle.message" bundle="alternate"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" title="Testing Message">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>"
+               title="Testing Message">
     </bean:define>
 </logic:equal>
 
@@ -240,16 +260,14 @@
 </logic:equal>
 
 
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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) || (expected == 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/TestFrameTag3.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag3.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag3.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag3.jsp Fri Feb 10 13:08:44 2006
@@ -1,6 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
@@ -16,7 +15,6 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameActionAnchor">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" anchor="XXX"/>
@@ -27,35 +25,35 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameActionFrameborder">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" frameborder="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" frameborder="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               frameborder="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameActionFrameName">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" frameName="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" name="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               name="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameActionLongdesc">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" longdesc="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" longdesc="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               longdesc="XXX">
     </bean:define>
 </logic:equal>
 
@@ -65,18 +63,19 @@
         <html:frame action="simpleAction" marginheight="15"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" marginheight="15">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               marginheight="15">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameActionMarginwidth">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" marginwidth="10"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" marginwidth="10">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               marginwidth="10">
     </bean:define>
 </logic:equal>
 
@@ -87,38 +86,44 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameActionNamePropertyNoScope">
-   <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame action="simpleAction" name="paramPropertyMap" property="map"/>
-   </bean:define>
-   <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
-   <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:frame action="simpleAction" name="paramPropertyMap"
+                    property="map"/>
+    </bean:define>
+    <bean:define id="thisMap" name="paramPropertyMap" property="map"
+                 type="java.util.Map"/>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameActionNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame action="simpleAction" name="paramMap" scope="application"/>
+        <html:frame action="simpleAction" name="paramMap"
+                    scope="application"/>
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameActionNamePropertyApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameActionNamePropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame action="simpleAction" name="paramPropertyMap" property="map" scope="application"/>
+        <html:frame action="simpleAction" name="paramPropertyMap"
+                    property="map" scope="application"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -128,17 +133,19 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameActionNamePropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame action="simpleAction" name="paramPropertyMap" property="map" scope="session"/>
+        <html:frame action="simpleAction" name="paramPropertyMap"
+                    property="map" scope="session"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -148,17 +155,19 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameActionNamePropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame action="simpleAction" name="paramPropertyMap" property="map" scope="request"/>
+        <html:frame action="simpleAction" name="paramPropertyMap"
+                    property="map" scope="request"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, "simpleAction", null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -168,7 +177,8 @@
         <html:frame action="simpleAction" noresize="true"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -177,7 +187,8 @@
         <html:frame action="simpleAction" noresize="True"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -218,13 +229,14 @@
 </logic:equal>
 
 
-<% 
-String expected  = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
-
-if ((expected == null) || (expected == 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);
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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);
 %>

Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag4.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag4.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag4.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag4.jsp Fri Feb 10 13:08:44 2006
@@ -1,102 +1,107 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
 
 <logic:equal name="runTest" value="testFrameActionParamIdParamNameNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" paramName="paramName"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameParamPropertyNoScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameParamPropertyNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" paramName="paramName"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameParamPropertyApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameParamPropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameSessionScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameSessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" paramName="paramName"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameParamPropertySessionScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameParamPropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameRequestScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" paramName="paramName"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameActionParamIdParamNameParamPropertyRequestScope">
+<logic:equal name="runTest"
+             value="testFrameActionParamIdParamNameParamPropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame action="simpleAction" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame action="simpleAction" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-
-
-
-
-
-
 <logic:equal name="runTest" value="testFrameActionScrolling1">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame action="simpleAction" scrolling="yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="yes">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="yes">
     </bean:define>
 </logic:equal>
 
@@ -106,7 +111,8 @@
         <html:frame action="simpleAction" scrolling="Yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="Yes">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="Yes">
     </bean:define>
 </logic:equal>
 
@@ -116,7 +122,8 @@
         <html:frame action="simpleAction" scrolling="YES"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="YES">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="YES">
     </bean:define>
 </logic:equal>
 
@@ -126,7 +133,8 @@
         <html:frame action="simpleAction" scrolling="no"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="no">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="no">
     </bean:define>
 </logic:equal>
 
@@ -136,7 +144,8 @@
         <html:frame action="simpleAction" scrolling="No"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="No">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="No">
     </bean:define>
 </logic:equal>
 
@@ -146,7 +155,8 @@
         <html:frame action="simpleAction" scrolling="NO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="NO">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="NO">
     </bean:define>
 </logic:equal>
 
@@ -156,7 +166,8 @@
         <html:frame action="simpleAction" scrolling="auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="auto">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="auto">
     </bean:define>
 </logic:equal>
 
@@ -166,7 +177,8 @@
         <html:frame action="simpleAction" scrolling="Auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="Auto">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="Auto">
     </bean:define>
 </logic:equal>
 
@@ -176,7 +188,8 @@
         <html:frame action="simpleAction" scrolling="AUTO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="AUTO">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="AUTO">
     </bean:define>
 </logic:equal>
 
@@ -186,7 +199,8 @@
         <html:frame action="simpleAction" scrolling="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" scrolling="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               scrolling="XXX">
     </bean:define>
 </logic:equal>
 
@@ -196,7 +210,8 @@
         <html:frame action="simpleAction" style="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" style="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               style="XXX">
     </bean:define>
 </logic:equal>
 
@@ -206,7 +221,8 @@
         <html:frame action="simpleAction" title="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" title="XXX">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               title="XXX">
     </bean:define>
 </logic:equal>
 
@@ -216,7 +232,8 @@
         <html:frame action="simpleAction" titleKey="default.bundle.message"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>" title="Testing Message">
+        <frame src="<%=response.encodeURL( request.getContextPath() + "/simpleAction.do")%>"
+               title="Testing Message">
     </bean:define>
 </logic:equal>
 
@@ -231,16 +248,14 @@
 </logic:equal>
 
 
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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) || (expected == 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/TestFrameTag5.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag5.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag5.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag5.jsp Fri Feb 10 13:08:44 2006
@@ -1,6 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
@@ -16,7 +15,6 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameHrefAnchor">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" anchor="XXX"/>
@@ -27,35 +25,35 @@
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameHrefFrameborder">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" frameborder="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" frameborder="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               frameborder="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameHrefFrameName">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" frameName="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" name="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               name="XXX">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameHrefLongdesc">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" longdesc="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" longdesc="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               longdesc="XXX">
     </bean:define>
 </logic:equal>
 
@@ -65,18 +63,19 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" marginheight="15"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" marginheight="15">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               marginheight="15">
     </bean:define>
 </logic:equal>
 
 
-
 <logic:equal name="runTest" value="testFrameHrefMarginwidth">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" marginwidth="10"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" marginwidth="10">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               marginwidth="10">
     </bean:define>
 </logic:equal>
 
@@ -87,78 +86,90 @@
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameHrefNamePropertyNoScope">
-   <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramPropertyMap" property="map"/>
-   </bean:define>
-   <bean:define id="thisMap" name="paramPropertyMap" property="map" type="java.util.Map"/>
-   <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+    <bean:define id="TEST_RESULTS" toScope="page">
+        <html:frame href="/path/to/non/existing/jsp.jsp"
+                    name="paramPropertyMap" property="map"/>
+    </bean:define>
+    <bean:define id="thisMap" name="paramPropertyMap" property="map"
+                 type="java.util.Map"/>
+    <bean:define id="EXPECTED_RESULTS" toScope="page">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap" scope="application"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap"
+                    scope="application"/>
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNamePropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramPropertyMap" property="map" scope="application"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp"
+                    name="paramPropertyMap" property="map"
+                    scope="application"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNameSessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap" scope="session"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap"
+                    scope="session"/>
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNamePropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramPropertyMap" property="map" scope="session"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp"
+                    name="paramPropertyMap" property="map" scope="session"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNameRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap" scope="request"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramMap"
+                    scope="request"/>
     </bean:define>
     <bean:define id="thisMap" name="paramMap" type="java.util.Map"/>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
 <logic:equal name="runTest" value="testFrameHrefNamePropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" name="paramPropertyMap" property="map" scope="request"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp"
+                    name="paramPropertyMap" property="map" scope="request"/>
     </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="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
+        <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, "/path/to/non/existing/jsp.jsp", null, null, null, thisMap, null, false)%>">
     </bean:define>
 </logic:equal>
 
@@ -168,7 +179,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" noresize="true"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -177,7 +189,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" noresize="True"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" noresize="noresize">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               noresize="noresize">
     </bean:define>
 </logic:equal>
 
@@ -218,13 +231,14 @@
 </logic:equal>
 
 
-<% 
-String expected  = (String) pageContext.getAttribute("EXPECTED_RESULTS");
-String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
-
-if ((expected == null) || (expected == 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);
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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);
 %>

Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag6.jsp
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag6.jsp?rev=376852&r1=376851&r2=376852&view=diff
==============================================================================
--- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag6.jsp (original)
+++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFrameTag6.jsp Fri Feb 10 13:08:44 2006
@@ -1,102 +1,105 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@page import="junit.framework.Assert"%>
-<%@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" %>
 
 <logic:equal name="runTest" value="testFrameHrefParamIdParamNameNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" paramName="paramName"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameHrefParamIdParamNameParamPropertyNoScope">
+<logic:equal name="runTest"
+             value="testFrameHrefParamIdParamNameParamPropertyNoScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-<logic:equal name="runTest" value="testFrameHrefParamIdParamNameApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameHrefParamIdParamNameApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" paramName="paramName"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameHrefParamIdParamNameParamPropertyApplicationScope">
+<logic:equal name="runTest"
+             value="testFrameHrefParamIdParamNameParamPropertyApplicationScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameHrefParamIdParamNameSessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" paramName="paramName"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameHrefParamIdParamNameParamPropertySessionScope">
+<logic:equal name="runTest"
+             value="testFrameHrefParamIdParamNameParamPropertySessionScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameHrefParamIdParamNameRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" paramName="paramName"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="paramName"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramValue">
     </bean:define>
 </logic:equal>
 
-<logic:equal name="runTest" value="testFrameHrefParamIdParamNameParamPropertyRequestScope">
+<logic:equal name="runTest"
+             value="testFrameHrefParamIdParamNameParamPropertyRequestScope">
     <bean:define id="TEST_RESULTS" toScope="page">
-		<html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam" 
-			paramName="testingParamProperty" paramProperty="string"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp" paramId="myParam"
+                    paramName="testingParamProperty" paramProperty="string"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-		<frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>?myParam=paramPropertyValue">
     </bean:define>
 </logic:equal>
 
 
-
-
-
-
-
-
 <logic:equal name="runTest" value="testFrameHrefScrolling1">
     <bean:define id="TEST_RESULTS" toScope="page">
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="yes">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="yes">
     </bean:define>
 </logic:equal>
 
@@ -106,7 +109,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="Yes"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="Yes">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="Yes">
     </bean:define>
 </logic:equal>
 
@@ -116,7 +120,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="YES"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="YES">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="YES">
     </bean:define>
 </logic:equal>
 
@@ -126,7 +131,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="no"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="no">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="no">
     </bean:define>
 </logic:equal>
 
@@ -136,7 +142,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="No"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="No">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="No">
     </bean:define>
 </logic:equal>
 
@@ -146,7 +153,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="NO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="NO">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="NO">
     </bean:define>
 </logic:equal>
 
@@ -156,7 +164,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="auto">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="auto">
     </bean:define>
 </logic:equal>
 
@@ -166,7 +175,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="Auto"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="Auto">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="Auto">
     </bean:define>
 </logic:equal>
 
@@ -176,7 +186,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="AUTO"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="AUTO">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="AUTO">
     </bean:define>
 </logic:equal>
 
@@ -186,7 +197,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" scrolling="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" scrolling="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               scrolling="XXX">
     </bean:define>
 </logic:equal>
 
@@ -196,7 +208,8 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" style="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" style="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               style="XXX">
     </bean:define>
 </logic:equal>
 
@@ -206,17 +219,20 @@
         <html:frame href="/path/to/non/existing/jsp.jsp" title="XXX"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" title="XXX">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               title="XXX">
     </bean:define>
 </logic:equal>
 
 
 <logic:equal name="runTest" value="testFrameHrefTitleKey">
     <bean:define id="TEST_RESULTS" toScope="page">
-        <html:frame href="/path/to/non/existing/jsp.jsp" titleKey="default.bundle.message"/>
+        <html:frame href="/path/to/non/existing/jsp.jsp"
+                    titleKey="default.bundle.message"/>
     </bean:define>
     <bean:define id="EXPECTED_RESULTS" toScope="page">
-        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>" title="Testing Message">
+        <frame src="<%=response.encodeURL("/path/to/non/existing/jsp.jsp")%>"
+               title="Testing Message">
     </bean:define>
 </logic:equal>
 
@@ -231,16 +247,14 @@
 </logic:equal>
 
 
+<%
+    String expected = (String) pageContext.getAttribute("EXPECTED_RESULTS");
+    String compareTo = (String) pageContext.getAttribute("TEST_RESULTS");
+
+    if ((expected == null) || (expected == 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) || (expected == 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


Mime
View raw message