You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2005/01/21 15:44:27 UTC
cvs commit: jakarta-commons/jelly/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean suite.jelly
dion 2005/01/21 06:44:27
Modified: jelly/src/test/org/apache/commons/jelly suite.jelly
jelly/jelly-tags/bean project.xml
jelly/jelly-tags/bean/xdocs changes.xml
jelly/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean
suite.jelly
Log:
Fix unit tests using non-existent test:assertTrue tag
PR: JELLY-197
Obtained from: Marc DeXet
Submitted by: Marc DeXet
Reviewed by: dIon
Revision Changes Path
1.21 +6 -6 jakarta-commons/jelly/src/test/org/apache/commons/jelly/suite.jelly
Index: suite.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/suite.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- suite.jelly 31 Aug 2004 04:55:02 -0000 1.20
+++ suite.jelly 21 Jan 2005 14:44:27 -0000 1.21
@@ -256,7 +256,7 @@
</j:if>
</j:forEach>
- <test:assertTrue test="${i==4}"/>
+ <test:assert test="${i==4}"/>
<j:while test="${i != 10}">
<j:if test="${i==6}">
@@ -265,7 +265,7 @@
<j:set var="i" value="${i+1}"/>
</j:while>
- <test:assertTrue test="${i==6}"/>
+ <test:assert test="${i==6}"/>
</test:case>
@@ -275,14 +275,14 @@
<j:break test="${i==4}"/>
</j:forEach>
- <test:assertTrue test="${i==4}"/>
+ <test:assert test="${i==4}"/>
<j:while test="${i != 10}">
<j:break test="${i==6}"/>
<j:set var="i" value="${i+1}"/>
</j:while>
- <test:assertTrue test="${i==6}"/>
+ <test:assert test="${i==6}"/>
</test:case>
@@ -315,7 +315,7 @@
but export to them -->
<j:set var="test1" value="original"/>
<j:import uri="import1.jelly"/>
- <test:assertTrue test="${test1 == null}"/>
+ <test:assert test="${test1 == null}"/>
<!-- inherit parent vars, and export to them -->
<j:set var="test1" value="original"/>
@@ -326,7 +326,7 @@
but export to them -->
<j:set var="test1" value="original"/>
<j:import uri="import1.jelly" inherit="false"/>
- <test:assertTrue test="${test1 == null}"/>
+ <test:assert test="${test1 == null}"/>
</test:case>
1.17 +1 -1 jakarta-commons/jelly/jelly-tags/bean/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/bean/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 10 Jan 2005 03:20:01 -0000 1.16
+++ project.xml 21 Jan 2005 14:44:27 -0000 1.17
@@ -18,7 +18,7 @@
<extend>${basedir}/../tag-project.xml</extend>
<id>commons-jelly-tags-bean</id>
<name>commons-jelly-tags-bean</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0.1-SNAPSHOT</currentVersion>
<package>org.apache.commons.jelly.tags.bean</package>
<description>
1.3 +3 -0 jakarta-commons/jelly/jelly-tags/bean/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/bean/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 10 Sep 2004 14:00:45 -0000 1.2
+++ changes.xml 21 Jan 2005 14:44:27 -0000 1.3
@@ -24,6 +24,9 @@
<author email="dion@apache.org">dIon Gillard</author>
</properties>
<body>
+ <release version="1.0.1" date="in CVS">
+ <action dev="dion" type="fix">Test cases not functioning</action>
+ </release>
<release version="1.0" date="2004-09-10">
<action dev="dion" type="add">Initial Release</action>
</release>
1.7 +38 -38 jakarta-commons/jelly/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/suite.jelly
Index: suite.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/bean/src/test/org/apache/commons/jelly/tags/bean/suite.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- suite.jelly 8 Sep 2004 05:13:30 -0000 1.6
+++ suite.jelly 21 Jan 2005 14:44:27 -0000 1.7
@@ -48,16 +48,16 @@
<test:assertEquals expected="James" actual="${c1.name}"/>
<test:assertEquals expected="London" actual="${c1.location}"/>
- <test:assertTrue test="${size(c1.orders) == 2}"/>
+ <test:assert test="${size(c1.orders) == 2}"/>
- <test:assertTrue test="${c1.orders[0].amount == 100}"/>
- <test:assertTrue test="${c1.orders[0].price == 2.99}"/>
+ <test:assert test="${c1.orders[0].amount == 100}"/>
+ <test:assert test="${c1.orders[0].price == 2.99}"/>
- <test:assertTrue test="${c1.orders[1].amount == 200}"/>
- <test:assertTrue test="${c1.orders[1].price == 4.99}"/>
+ <test:assert test="${c1.orders[1].amount == 200}"/>
+ <test:assert test="${c1.orders[1].price == 4.99}"/>
- <test:assertTrue test="${c1.orders[0].product != null}"/>
- <test:assertTrue test="${c1.orders[1].product != null}"/>
+ <test:assert test="${c1.orders[0].product != null}"/>
+ <test:assert test="${c1.orders[1].product != null}"/>
<test:assertEquals expected="p1" actual="${c1.orders[0].product.id}"/>
<test:assertEquals expected="Beer" actual="${c1.orders[0].product.name}"/>
@@ -88,16 +88,16 @@
<test:assertEquals expected="James" actual="${c1.name}"/>
<test:assertEquals expected="London" actual="${c1.location}"/>
- <test:assertTrue test="${size(c1.orders) == 2}"/>
+ <test:assert test="${size(c1.orders) == 2}"/>
- <test:assertTrue test="${c1.orders[0].amount == 100}"/>
- <test:assertTrue test="${c1.orders[0].price == 2.99}"/>
+ <test:assert test="${c1.orders[0].amount == 100}"/>
+ <test:assert test="${c1.orders[0].price == 2.99}"/>
- <test:assertTrue test="${c1.orders[1].amount == 200}"/>
- <test:assertTrue test="${c1.orders[1].price == 4.99}"/>
+ <test:assert test="${c1.orders[1].amount == 200}"/>
+ <test:assert test="${c1.orders[1].price == 4.99}"/>
- <test:assertTrue test="${c1.orders[0].product != null}"/>
- <test:assertTrue test="${c1.orders[1].product != null}"/>
+ <test:assert test="${c1.orders[0].product != null}"/>
+ <test:assert test="${c1.orders[1].product != null}"/>
<test:assertEquals expected="p1" actual="${c1.orders[0].product.id}"/>
<test:assertEquals expected="Beer" actual="${c1.orders[0].product.name}"/>
@@ -129,16 +129,16 @@
<test:assertEquals expected="James" actual="${c1.name}"/>
<test:assertEquals expected="London" actual="${c1.location}"/>
- <test:assertTrue test="${size(c1.orders) == 2}"/>
+ <test:assert test="${size(c1.orders) == 2}"/>
- <test:assertTrue test="${c1.orders[0].amount == 100}"/>
- <test:assertTrue test="${c1.orders[0].price == 2.99}"/>
+ <test:assert test="${c1.orders[0].amount == 100}"/>
+ <test:assert test="${c1.orders[0].price == 2.99}"/>
- <test:assertTrue test="${c1.orders[1].amount == 200}"/>
- <test:assertTrue test="${c1.orders[1].price == 4.99}"/>
+ <test:assert test="${c1.orders[1].amount == 200}"/>
+ <test:assert test="${c1.orders[1].price == 4.99}"/>
- <test:assertTrue test="${c1.orders[0].product != null}"/>
- <test:assertTrue test="${c1.orders[1].product != null}"/>
+ <test:assert test="${c1.orders[0].product != null}"/>
+ <test:assert test="${c1.orders[1].product != null}"/>
<test:assertEquals expected="p1" actual="${c1.orders[0].product.id}"/>
<test:assertEquals expected="Beer" actual="${c1.orders[0].product.name}"/>
@@ -168,21 +168,21 @@
<log:info>Created a list of customers ${list}</log:info>
- <test:assertTrue test="${size(list) == 2}"/>
+ <test:assert test="${size(list) == 2}"/>
<test:assertEquals expected="James" actual="${list[0].name}"/>
<test:assertEquals expected="London" actual="${list[0].location}"/>
- <test:assertTrue test="${size(list[0].orders) == 2}"/>
+ <test:assert test="${size(list[0].orders) == 2}"/>
- <test:assertTrue test="${list[0].orders[0].amount == 100}"/>
- <test:assertTrue test="${list[0].orders[0].price == 2.99}"/>
+ <test:assert test="${list[0].orders[0].amount == 100}"/>
+ <test:assert test="${list[0].orders[0].price == 2.99}"/>
- <test:assertTrue test="${list[0].orders[1].amount == 200}"/>
- <test:assertTrue test="${list[0].orders[1].price == 4.99}"/>
+ <test:assert test="${list[0].orders[1].amount == 200}"/>
+ <test:assert test="${list[0].orders[1].price == 4.99}"/>
- <test:assertTrue test="${list[0].orders[0].product != null}"/>
- <test:assertTrue test="${list[0].orders[1].product != null}"/>
+ <test:assert test="${list[0].orders[0].product != null}"/>
+ <test:assert test="${list[0].orders[1].product != null}"/>
<test:assertEquals expected="p1" actual="${list[0].orders[0].product.id}"/>
<test:assertEquals expected="Beer" actual="${list[0].orders[0].product.name}"/>
@@ -214,8 +214,8 @@
</customer>
</manager>
- <test:assertTrue test="${foo.isInvoked()}"/>
- <test:assertTrue test="${size(foo.customers) == 2}"/>
+ <test:assert test="${foo.isInvoked()}"/>
+ <test:assert test="${size(foo.customers) == 2}"/>
</test:case>
@@ -237,21 +237,21 @@
</customer>
</myContainer>
- <test:assertTrue test="${size(list) == 2}"/>
+ <test:assert test="${size(list) == 2}"/>
Created list: ${list}
<test:assertEquals expected="James" actual="${list[0].name}"/>
<test:assertEquals expected="London" actual="${list[0].location}"/>
- <test:assertTrue test="${list[0].orders[0].amount == 100}"/>
- <test:assertTrue test="${list[0].orders[0].price == 2.99}"/>
+ <test:assert test="${list[0].orders[0].amount == 100}"/>
+ <test:assert test="${list[0].orders[0].price == 2.99}"/>
- <test:assertTrue test="${list[0].orders[1].amount == 200}"/>
- <test:assertTrue test="${list[0].orders[1].price == 4.99}"/>
+ <test:assert test="${list[0].orders[1].amount == 200}"/>
+ <test:assert test="${list[0].orders[1].price == 4.99}"/>
- <test:assertTrue test="${list[0].orders[0].product != null}"/>
- <test:assertTrue test="${list[0].orders[1].product != null}"/>
+ <test:assert test="${list[0].orders[0].product != null}"/>
+ <test:assert test="${list[0].orders[1].product != null}"/>
<test:assertEquals expected="p1" actual="${list[0].orders[0].product.id}"/>
<test:assertEquals expected="Beer" actual="${list[0].orders[0].product.name}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org