[PATCH] (3 of 3) Cactus test fixes for taglib subproject

Sat, 17 Sep 2005 13:41:32 -0700

The following diff cleans up the remaining test failures. Again, the changes are trivial: the order attributes are generated in the output HTML changed, and a couple of the tests weren't setting up the expected results correctly (hard-coding the server name). 

To quickly run the test case in isolation before/after patching, use

    maven cactus:single \
        -Dtestcase=org.apache.struts.taglib.html.TestBaseTag

and

    maven cactus:single \
        -Dtestcase=org.apache.struts.taglib.html.TestFormTag1

(make sure you've deployed struts-config.xml from my previous post first).

L.

Index: src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp
===================================================================
--- src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp (revision 289678) +++ src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp (working copy) 
@@ -201,7 +201,7 @@
                </html:form>
        </bean:define>
        <bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" id="id.goes.here"> + <form name="testFormBean" id="id.goes.here" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> 
                </form>
        </bean:define>
 </logic:equal>
Index: src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp
===================================================================
--- src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp (revision 289678) +++ src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp (working copy) 
@@ -22,7 +22,7 @@
                <html:base/>
        </bean:define>
        <bean:define id="EXPECTED_RESULTS" toScope="page">
- <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/html/TestBaseTag.jsp"> 
        </bean:define>
 </logic:equal>

@@ -31,7 +31,7 @@
                <html:base target="My-Other-Frame"/>
        </bean:define>
        <bean:define id="EXPECTED_RESULTS" toScope="page">
- <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp" target="My-Other-Frame"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/html/TestBaseTag.jsp" target="My-Other-Frame"> 
        </bean:define>
 </logic:equal>

@@ -49,7 +49,7 @@
                <html:base server="www.my-server-name.com"/>
        </bean:define>
        <bean:define id="EXPECTED_RESULTS" toScope="page">
- <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/html/TestBaseTag.jsp"> 
        </bean:define>
 </logic:equal>

@@ -58,7 +58,7 @@
<html:base server="www.my-server-name.com" target="My-Other-Frame"/> 
        </bean:define>
        <bean:define id="EXPECTED_RESULTS" toScope="page">
- <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp" target="My-Other-Frame"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/html/TestBaseTag.jsp" target="My-Other-Frame"> 
        </bean:define>
 </logic:equal>


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to