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 @@ - @@ -27,35 +25,35 @@ - - " frameborder="XXX"> + " + frameborder="XXX"> - - " name="XXX"> + " + name="XXX"> - - " longdesc="XXX"> + " + longdesc="XXX"> @@ -65,18 +63,19 @@ - " marginheight="15"> + " + marginheight="15"> - - " marginwidth="10"> + " + marginwidth="10"> @@ -87,38 +86,44 @@ - "> + "> - - - - - - "> + + + + + + "> - + - "> + "> - + - + - + - "> + "> @@ -128,17 +133,19 @@ - "> + "> - + - + - "> + "> @@ -148,17 +155,19 @@ - "> + "> - + - + - "> + "> @@ -168,7 +177,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -177,7 +187,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -218,13 +229,14 @@ -<% -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" %> - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - - - - - - - " scrolling="yes"> + " + scrolling="yes"> @@ -106,7 +111,8 @@ - " scrolling="Yes"> + " + scrolling="Yes"> @@ -116,7 +122,8 @@ - " scrolling="YES"> + " + scrolling="YES"> @@ -126,7 +133,8 @@ - " scrolling="no"> + " + scrolling="no"> @@ -136,7 +144,8 @@ - " scrolling="No"> + " + scrolling="No"> @@ -146,7 +155,8 @@ - " scrolling="NO"> + " + scrolling="NO"> @@ -156,7 +166,8 @@ - " scrolling="auto"> + " + scrolling="auto"> @@ -166,7 +177,8 @@ - " scrolling="Auto"> + " + scrolling="Auto"> @@ -176,7 +188,8 @@ - " scrolling="AUTO"> + " + scrolling="AUTO"> @@ -186,7 +199,8 @@ - " scrolling="XXX"> + " + scrolling="XXX"> @@ -196,7 +210,8 @@ - " style="XXX"> + " + style="XXX"> @@ -206,26 +221,31 @@ - " title="XXX"> + " + title="XXX"> - + - " title="Testing Message"> + " + title="Testing Message"> - + - " title="Testing Message"> + " + title="Testing Message"> @@ -240,16 +260,14 @@ +<% + 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 @@ - @@ -27,35 +25,35 @@ - - " frameborder="XXX"> + " + frameborder="XXX"> - - " name="XXX"> + " + name="XXX"> - - " longdesc="XXX"> + " + longdesc="XXX"> @@ -65,18 +63,19 @@ - " marginheight="15"> + " + marginheight="15"> - - " marginwidth="10"> + " + marginwidth="10"> @@ -87,38 +86,44 @@ - "> + "> - - - - - - "> + + + + + + "> - + - "> + "> - + - + - + - "> + "> @@ -128,17 +133,19 @@ - "> + "> - + - + - "> + "> @@ -148,17 +155,19 @@ - "> + "> - + - + - "> + "> @@ -168,7 +177,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -177,7 +187,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -218,13 +229,14 @@ -<% -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" %> - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - - - - - - - " scrolling="yes"> + " + scrolling="yes"> @@ -106,7 +111,8 @@ - " scrolling="Yes"> + " + scrolling="Yes"> @@ -116,7 +122,8 @@ - " scrolling="YES"> + " + scrolling="YES"> @@ -126,7 +133,8 @@ - " scrolling="no"> + " + scrolling="no"> @@ -136,7 +144,8 @@ - " scrolling="No"> + " + scrolling="No"> @@ -146,7 +155,8 @@ - " scrolling="NO"> + " + scrolling="NO"> @@ -156,7 +166,8 @@ - " scrolling="auto"> + " + scrolling="auto"> @@ -166,7 +177,8 @@ - " scrolling="Auto"> + " + scrolling="Auto"> @@ -176,7 +188,8 @@ - " scrolling="AUTO"> + " + scrolling="AUTO"> @@ -186,7 +199,8 @@ - " scrolling="XXX"> + " + scrolling="XXX"> @@ -196,7 +210,8 @@ - " style="XXX"> + " + style="XXX"> @@ -206,7 +221,8 @@ - " title="XXX"> + " + title="XXX"> @@ -216,7 +232,8 @@ - " title="Testing Message"> + " + title="Testing Message"> @@ -231,16 +248,14 @@ +<% + 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 @@ - @@ -27,35 +25,35 @@ - - " frameborder="XXX"> + " + frameborder="XXX"> - - " name="XXX"> + " + name="XXX"> - - " longdesc="XXX"> + " + longdesc="XXX"> @@ -65,18 +63,19 @@ - " marginheight="15"> + " + marginheight="15"> - - " marginwidth="10"> + " + marginwidth="10"> @@ -87,78 +86,90 @@ - "> + "> - - - - - - "> + + + + + + "> - + - "> + "> - + - + - "> + "> - + - "> + "> - + - + - "> + "> - + - "> + "> - + - + - "> + "> @@ -168,7 +179,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -177,7 +189,8 @@ - " noresize="noresize"> + " + noresize="noresize"> @@ -218,13 +231,14 @@ -<% -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" %> - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - + - ?myParam=paramValue"> + ?myParam=paramValue"> - + - + - ?myParam=paramPropertyValue"> + ?myParam=paramPropertyValue"> - - - - - - - " scrolling="yes"> + " + scrolling="yes"> @@ -106,7 +109,8 @@ - " scrolling="Yes"> + " + scrolling="Yes"> @@ -116,7 +120,8 @@ - " scrolling="YES"> + " + scrolling="YES"> @@ -126,7 +131,8 @@ - " scrolling="no"> + " + scrolling="no"> @@ -136,7 +142,8 @@ - " scrolling="No"> + " + scrolling="No"> @@ -146,7 +153,8 @@ - " scrolling="NO"> + " + scrolling="NO"> @@ -156,7 +164,8 @@ - " scrolling="auto"> + " + scrolling="auto"> @@ -166,7 +175,8 @@ - " scrolling="Auto"> + " + scrolling="Auto"> @@ -176,7 +186,8 @@ - " scrolling="AUTO"> + " + scrolling="AUTO"> @@ -186,7 +197,8 @@ - " scrolling="XXX"> + " + scrolling="XXX"> @@ -196,7 +208,8 @@ - " style="XXX"> + " + style="XXX"> @@ -206,17 +219,20 @@ - " title="XXX"> + " + title="XXX"> - + - " title="Testing Message"> + " + title="Testing Message"> @@ -231,16 +247,14 @@ +<% + 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