Update of /var/cvs/html/mmbase/components/test
In directory james.mmbase.org:/tmp/cvs-serv31550
Modified Files:
suburls.jspx urls.jspx
Log Message:
In case of failure, show produced and expected urls
See also: http://cvs.mmbase.org/viewcvs/html/mmbase/components/test
Index: suburls.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/test/suburls.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- suburls.jspx 24 Feb 2008 10:51:17 -0000 1.1
+++ suburls.jspx 21 Mar 2008 09:14:43 -0000 1.2
@@ -2,6 +2,7 @@
version="1.2"
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:jsp="http://java.sun.com/JSP/Page";
>
@@ -11,12 +12,20 @@
<div
class="test mm_c mm_c_test mm_c_b_urls
${requestScope.componentClassName}"
id="${requestScope.componentId}">
+
<mm:import id="seq" vartype="integer">${empty
requestScope.suburls_sequence ? 1 : requestScope.suburls_sequence +
1}</mm:import>
+
<mm:write request="suburls_sequence" referid="seq" />
<h1>Sub-urls ${seq}</h1>
- <mm:link absolute="context" page="suburls">
+ <mm:import id="url">/mmbase/test/test/urls?1.${seq}:a=AA</mm:import>
+ <mm:link absolute="context" page="suburls" write="false">
<mm:param name="a">AA</mm:param>
- <p>${_ eq '/mmbase/test/test/urls?1.seq:a=AA' ? 'ok' : 'NOT ok'}:
${_}</p>
+ <p>
+ <c:choose>
+ <c:when test="${_ eq url}">ok</c:when>
+ <c:otherwise>NOT OK ${_} != ${url}</c:otherwise>
+ </c:choose>
+ </p>
</mm:link>
</div>
</jsp:root>
Index: urls.jspx
===================================================================
RCS file: /var/cvs/html/mmbase/components/test/urls.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- urls.jspx 24 Feb 2008 10:51:17 -0000 1.1
+++ urls.jspx 21 Mar 2008 09:14:43 -0000 1.2
@@ -29,7 +29,9 @@
<mm:link absolute="context" referids="a" page="suburls">
<p>${_ eq '/mmbase/test/test/suburls?1:a=A' ? 'ok' : 'NOT ok'}: ${_}</p>
</mm:link>
+
<mm:component name="test" block="suburls" />
<mm:component name="test" block="suburls" />
+
</div>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
