martinc 2004/03/21 16:45:28 Modified: web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp Log: Fix some tests that were broken when module support was added to TagUtils.computeURL(). Revision Changes Path 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp Index: TestFrameTag1.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestFrameTag1.jsp 26 Dec 2003 22:08:01 -0000 1.3 +++ TestFrameTag1.jsp 22 Mar 2004 00:45:28 -0000 1.4 @@ -87,7 +87,7 @@ </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, 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> @@ -98,7 +98,7 @@ </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, 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> @@ -108,7 +108,7 @@ </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, 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> @@ -118,7 +118,7 @@ </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, 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,7 +128,7 @@ </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, 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> @@ -138,7 +138,7 @@ </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, 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,7 +148,7 @@ </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, 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> @@ -158,7 +158,7 @@ </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, 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> 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp Index: TestFrameTag3.jsp =================================================================== RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestFrameTag3.jsp 26 Dec 2003 22:08:01 -0000 1.3 +++ TestFrameTag3.jsp 22 Mar 2004 00:45:28 -0000 1.4 @@ -87,7 +87,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -98,7 +98,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -108,7 +108,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -118,7 +118,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -128,7 +128,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -138,7 +138,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -148,7 +148,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal> @@ -158,7 +158,7 @@ </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", thisMap, null, false)%>"> + <frame src="<%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, null, null, null, null, "simpleAction", thisMap, null, false)%>"> </bean:define> </logic:equal>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]