geirm 01/06/02 08:37:49
Modified: test/templates Tag: VEL_1_1_BRANCH logical.vm
test/templates/compare Tag: VEL_1_1_BRANCH logical.cmp
Log:
Update - rolling fix in main branch here into 1.1 for rc2
Revision Changes Path
No revision
No revision
1.7.4.1 +17 -1 jakarta-velocity/test/templates/logical.vm
Index: logical.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/logical.vm,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- logical.vm 2001/04/09 02:26:44 1.7
+++ logical.vm 2001/06/02 15:37:49 1.7.4.1
@@ -265,4 +265,20 @@
wrong
#else
right
-#end
\ No newline at end of file
+#end
+
+----------------------
+goofy but legal stuff
+----------------------
+#set($lala = ( false || true ) )
+Should equal true : $lala
+
+#set($fofo = ( true && true ) )
+Should equal true : $fofo
+
+#set($fofo = ( true && ( false || true ) ) )
+Should equal true : $fofo
+
+#set($fofo = ( ($t || $f) && $t))
+Should equal true : $fofo
+
No revision
No revision
1.5.4.1 +12 -0 jakarta-velocity/test/templates/compare/logical.cmp
Index: logical.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/logical.cmp,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- logical.cmp 2001/04/09 02:26:44 1.5
+++ logical.cmp 2001/06/02 15:37:49 1.5.4.1
@@ -97,3 +97,15 @@
right
right
+
+----------------------
+goofy but legal stuff
+----------------------
+Should equal true : true
+
+Should equal true : true
+
+Should equal true : true
+
+Should equal true : true
+
