You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by pf...@apache.org on 2005/01/31 21:35:47 UTC
cvs commit: jakarta-tapestry/framework/src/scripts TestLinkRenderers.xml
pferraro 2005/01/31 12:35:47
Modified: framework/src/test-data/context10 Home.html
framework/src/test-data/context10/WEB-INF Home.page
framework/src/scripts TestLinkRenderers.xml
Log:
Added test for DefaultLinkRenderer with a target.
Added tests for ButtonLinkRenderer: normal, disabled, and with target.
Revision Changes Path
1.5 +16 -1 jakarta-tapestry/framework/src/test-data/context10/Home.html
Index: Home.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test-data/context10/Home.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Home.html 12 Dec 2004 13:51:16 -0000 1.4
+++ Home.html 31 Jan 2005 20:35:47 -0000 1.5
@@ -11,12 +11,27 @@
Expecting: <span jwcid="@Insert" value="ognl:beans.configuredRenderer.scheme"/>://<span jwcid="@Insert" value="ognl:beans.configuredRenderer.serverName"/>:<span jwcid="@Insert" value="ognl:beans.configuredRenderer.port"/>
-
<a jwcid="third@DirectLink" renderer="bean:configuredRenderer" listener="listener:link" anchor="myanchor">Third</a>
<br/>
[<a jwcid="@DirectLink" disabled="ognl:true" listener="listener:link">Fourth</a>]
+<br/>
+
+<a jwcid="fifth@DirectLink" target="_blank" listener="listener:link">Fifth</a>
+
+<br/>
+
+<button jwcid="sixth@DirectLink" renderer="bean:buttonRenderer" listener="listener:link">Sixth</button>
+
+<br/>
+
+<button jwcid="seventh@DirectLink" renderer="bean:buttonRenderer" listener="listener:link" disabled="ognl:true">Seventh</button>
+
+<br/>
+
+<button jwcid="eighth@DirectLink" renderer="bean:buttonRenderer" listener="listener:link" target="_blank">Eighth</button>
+
</body>
</html>
\ No newline at end of file
1.3 +2 -0 jakarta-tapestry/framework/src/test-data/context10/WEB-INF/Home.page
Index: Home.page
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test-data/context10/WEB-INF/Home.page,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Home.page 6 Jan 2005 02:17:33 -0000 1.2
+++ Home.page 31 Jan 2005 20:35:47 -0000 1.3
@@ -30,4 +30,6 @@
<set-property name="serverName" expression=""myserver""/>
</bean>
+ <bean name="buttonRenderer" class="org.apache.tapestry.link.ButtonLinkRenderer" lifecycle="page"/>
+
</page-specification>
1.5 +97 -74 jakarta-tapestry/framework/src/scripts/TestLinkRenderers.xml
Index: TestLinkRenderers.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/scripts/TestLinkRenderers.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestLinkRenderers.xml 5 Jan 2005 23:17:16 -0000 1.4
+++ TestLinkRenderers.xml 31 Jan 2005 20:35:47 -0000 1.5
@@ -16,112 +16,135 @@
-->
<mock-test>
- <context name="c10" root="context10"/>
+ <context name="c10" root="context10"/>
- <servlet name="app" class="org.apache.tapestry.ApplicationServlet"/>
-
- <request>
-
- <assert-output name="Page Title">
+ <servlet name="app" class="org.apache.tapestry.ApplicationServlet"/>
+
+ <request>
+
+ <assert-output name="Page Title">
<![CDATA[
<title>Home</title>
]]>
- </assert-output>
-
- <assert-output name="First Link">
+ </assert-output>
+
+ <assert-output name="First Link">
<![CDATA[
<a href="/c10/app?component=first&page=Home&service=direct">First</a>
]]>
- </assert-output>
-
-
- <assert-output name="Second Link">
+ </assert-output>
+
+ <assert-output name="Second Link">
<![CDATA[
<a href="http://junit-test/c10/app?component=second&page=Home&service=direct">Second</a>
]]>
- </assert-output>
-
- <assert-output name="Configured Values">
-
- Expecting: https://myserver:8080
-
- </assert-output>
-
- <assert-output name="Third Link">
+ </assert-output>
+
+ <assert-output name="Configured Values">
+ Expecting: https://myserver:8080
+ </assert-output>
+
+ <assert-output name="Third Link">
<![CDATA[
<a href="https://myserver:8080/c10/app?component=third&page=Home&service=direct#myanchor">Third</a>
]]>
- </assert-output>
-
- <assert-output name="Fourth Link">
+ </assert-output>
+
+ <assert-output name="Fourth Link">
[Fourth]
- </assert-output>
-
-
- </request>
-
- <request>
- <parameter name="service" value="page"/>
- <parameter name="page" value="Two"/>
-
- <assert-output name="Page Title">
+ </assert-output>
+
+ <!-- Test link with target -->
+ <assert-output name="Fifth Link">
+<![CDATA[
+<a href="/c10/app?component=fifth&page=Home&service=direct" target="_blank">Fifth</a>
+]]>
+ </assert-output>
+
+ <!-- Test button link -->
+ <assert-output name="Sixth Link">
+<![CDATA[
+<button type="button" onclick="window.location='/c10/app?component=sixth&page=Home&service=direct'">Sixth</button>
+]]>
+ </assert-output>
+
+ <!-- Test disabled button link -->
+ <assert-output name="Seventh Link">
+<![CDATA[
+<button type="button" disabled="disabled" onclick="window.location='/c10/app?component=seventh&page=Home&service=direct'">Seventh</button>
+]]>
+ </assert-output>
+
+ <!-- Test button link with target -->
+ <assert-output name="Eighth Link">
+<![CDATA[
+<button type="button" onclick="window.open('/c10/app?component=eighth&page=Home&service=direct','_blank')">Eighth</button>
+]]>
+ </assert-output>
+
+ </request>
+
+ <request>
+ <parameter name="service" value="page"/>
+ <parameter name="page" value="Two"/>
+
+ <assert-output name="Page Title">
<![CDATA[
<title>Exception</title>
]]>
- </assert-output>
-
- <assert-output name="Message">
+ </assert-output>
+
+ <assert-output name="Message">
ILinkComponents may not be nested.
- </assert-output>
-
- </request>
-
- <!-- Check that ensures links with event handlers are inside a Body. -->
-
- <request>
- <parameter name="service" value="page"/>
- <parameter name="page" value="Three"/>
-
- <assert-output name="Page Title">
+ </assert-output>
+
+ </request>
+
+ <!-- Check that ensures links with event handlers are inside a Body. -->
+
+ <request>
+ <parameter name="service" value="page"/>
+ <parameter name="page" value="Three"/>
+
+ <assert-output name="Page Title">
<![CDATA[
<title>Exception</title>
]]>
- </assert-output>
-
- <assert-output name="Message">
+ </assert-output>
+
+ <assert-output name="Message">
A link component with multiple functions for a single event type must be contained within a Body.
- </assert-output>
-
- </request>
-
- <!-- Test same thing on a page with a Body -->
-
- <request>
- <parameter name="service" value="page"/>
- <parameter name="page" value="Four"/>
-
- <assert-output name="Page Title">
+ </assert-output>
+
+ </request>
+
+ <!-- Test same thing on a page with a Body -->
+
+ <request>
+ <parameter name="service" value="page"/>
+ <parameter name="page" value="Four"/>
+
+ <assert-output name="Page Title">
<![CDATA[
<title>Four</title>
]]>
- </assert-output>
-
- <assert-output name="Composite Method">
+ </assert-output>
+
+ <assert-output name="Composite Method">
function onClick_Link ()
{
eventHandler1();
eventHandler2();
eventHandler3();
}
- </assert-output>
-
- <assert-output name="Link">
+ </assert-output>
+
+ <assert-output name="Link">
<![CDATA[
<a href="/c10/app?component=link&page=Four&service=direct" onClick="javascript:onClick_Link();">
]]>
- </assert-output>
-
-
- </request>
-
+ </assert-output>
+
+ </request>
+
</mock-test>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org