You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2002/03/27 17:03:08 UTC

cvs commit: jakarta-velocity/test/templates/compare logical.cmp velocimacro2.cmp

geirm       02/03/27 08:03:08

  Modified:    test/templates logical.vm velocimacro2.vm
               test/templates/compare logical.cmp velocimacro2.cmp
  Log:
  testcases for fixes to 7396, 7466
  
  Revision  Changes    Path
  1.11      +7 -0      jakarta-velocity/test/templates/logical.vm
  
  Index: logical.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/test/templates/logical.vm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- logical.vm	25 Mar 2002 00:48:29 -0000	1.10
  +++ logical.vm	27 Mar 2002 16:03:07 -0000	1.11
  @@ -337,3 +337,10 @@
   #else
   wrong
   #end
  +
  +#set($val = ( 1 != 2))
  +#if( $val == true)
  +right
  +#else
  +wrong
  +#end
  \ No newline at end of file
  
  
  
  1.6       +21 -0     jakarta-velocity/test/templates/velocimacro2.vm
  
  Index: velocimacro2.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/test/templates/velocimacro2.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- velocimacro2.vm	23 Feb 2002 10:53:01 -0000	1.5
  +++ velocimacro2.vm	27 Mar 2002 16:03:07 -0000	1.6
  @@ -68,3 +68,24 @@
   #macro( schlorp $i )#blorp( "hi $i" ) #end
   
   #schlorp("victor")
  +
  +
  +##
  +## test all directive arg types
  +##
  +
  +#macro(dirarg $a)
  +>$a<
  +#end
  +
  +#set($ref = 1)
  +
  +#dirarg(1)
  +#dirarg(true)
  +#dirarg(false)
  +#dirarg("hello")
  +#dirarg('hello')
  +#dirarg($ref)
  +#dirarg([1..10])
  +#dirarg(['a','b',$ref])
  +
  
  
  
  1.9       +2 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- logical.cmp	25 Mar 2002 00:48:30 -0000	1.8
  +++ logical.cmp	27 Mar 2002 16:03:08 -0000	1.9
  @@ -129,3 +129,5 @@
   right
   
   right
  +
  +right
  
  
  
  1.6       +14 -1     jakarta-velocity/test/templates/compare/velocimacro2.cmp
  
  Index: velocimacro2.cmp
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/test/templates/compare/velocimacro2.cmp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- velocimacro2.cmp	23 Feb 2002 10:53:01 -0000	1.5
  +++ velocimacro2.cmp	27 Mar 2002 16:03:08 -0000	1.6
  @@ -27,4 +27,17 @@
     
   
   
  - hi victor  
  \ No newline at end of file
  + hi victor  
  +
  +
  +
  +
  +>1<
  +>true<
  +>false<
  +>hello<
  +>hello<
  +>1<
  +>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]<
  +>[a, b, 1]<
  +
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>