geirm 00/10/31 08:07:31
Modified: test/templates block.vm diabolical.vm equality.vm
foreach-array.vm if.vm logical.vm quotes.vm test.vm
test/templates/compare arithmetic.cmp block.cmp
diabolical.cmp directive.cmp equality.cmp
escape.cmp foreach-array.cmp foreach-method.cmp
foreach-variable.cmp formal.cmp if.cmp logical.cmp
method.cmp quotes.cmp sample.cmp test.cmp
Log:
Group commit of new and altered testing templates and their comparison files.
Nothing is radically changed. This were cleaned up to support the
new version of the parser that has cleaner output WRT newlines, spaces, etc. Look
at pedantic.vm in particular for some demonstrations.
You must use the latest parser for the output of the templates to match the new
compare files. Will describe in more detail in separate msg to list.
Revision Changes Path
1.3 +54 -8 jakarta-velocity/test/templates/block.vm
Index: block.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/block.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.vm 2000/10/23 21:18:27 1.2
+++ block.vm 2000/10/31 16:07:26 1.3
@@ -8,35 +8,81 @@
test doesn't fail incorrectly.
*#
+First test : spacing between stuff. Note that spacing preceeding the directives
counts!
+One blank line follows
#set $foo = false
-
#if ($foo)
this is true
#elseif ($bar)
this is false
#elseif (true)
- this
-#end
+ this should be followed by two blank lines
+#end
#if (true)
- this is the if statement.
+ this is the if statement. (followed by two blank lines)
#if (true)
- this is great
+ this is great (followed by a blank line, 4 spaces on a line,and 2 more, yes
there should be one after the 4 spaces)
#elseif (false)
this is also great.
- #end
+ #end
+
+#elseif (true)
+ this is the first elseif.
+#elseif (false)
+ this is the second elseif.
+#else
+ this is the else statement
+#end
+
+-- Second Test : no spacing between anything (1 blank line follows)
+#set $foo = false
+#if ($foo)
+ this is true
+#elseif ($bar)
+ this is false
+#elseif (true)
+ this
+#end
+#if (true)
+ this is the if statement.
+ #if (true)
+ this is great (line w/ 4 spaces follows (from in front of the \#end) +
another blank line)
+ #elseif (false)
+ this is also great.
+ #end
#elseif (true)
this is the first elseif.
#elseif (false)
this is the second elseif.
#else
this is the else statement
-#end
+#end
+
+-- Third Test : tight tight tight. Note that \#end eats the \\n, which is NOT what
people expect, I think.
+-- one blank line follows
+
+blargh #if(true)This follows blargh#end
+blargh#if(true)This immedately follows blargh with a following newline
+#end
+
+-- Fourth Test : another tight tight tight. Note that a space trailing the \#end
does the trick.
+-- one blank line follows
+
+blargh #if(true)This follows blargh#end
+blargh#if(true)This immedately follows blargh with a following newline
+#end
+
+-- Fifth Test : different kind of tight. blank line follows
-## this is a single line comment
+blargh
+#if(true)
+blargh2
+#end
+blargh3
1.2 +6 -0 jakarta-velocity/test/templates/diabolical.vm
Index: diabolical.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/diabolical.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- diabolical.vm 2000/10/31 02:43:41 1.1
+++ diabolical.vm 2000/10/31 16:07:26 1.2
@@ -22,3 +22,9 @@
"#FFFFFF"
"$ow"
+"$row","var"
+#333333
+#FFFFFF
+"#FFFFF
+#FFFFF"
+
1.3 +3 -3 jakarta-velocity/test/templates/equality.vm
Index: equality.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/equality.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- equality.vm 2000/10/23 21:18:27 1.2
+++ equality.vm 2000/10/31 16:07:26 1.3
@@ -20,12 +20,12 @@
#if ($count == 5)
the count is 5!
-#end
+#end
#if ($login == false)
the user isn't logged in.
-#end
+#end
#if ($count != 3)
\$count is not equal to 3
-#end
+#end
\ No newline at end of file
1.3 +11 -3 jakarta-velocity/test/templates/foreach-array.vm
Index: foreach-array.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/foreach-array.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- foreach-array.vm 2000/10/23 21:18:27 1.2
+++ foreach-array.vm 2000/10/31 16:07:26 1.3
@@ -9,14 +9,22 @@
*#
-Foreach with an array.
+--Foreach with an array. 2 blank lines follow
##foreach ($element in $provider.Array)
-$stringarray
-
<table>
#foreach ($element in $stringarray)
+ <tr>
+ <td>This is $element and it is the $velocityCount item</td>
+ </tr>
+#end
+</table>
+
+--Foreach with a null array. 1 blank line follows
+
+<table>
+#foreach ($element in $woogiefoogie)
<tr>
<td>This is $element and it is the $velocityCount item</td>
</tr>
1.3 +2 -2 jakarta-velocity/test/templates/if.vm
Index: if.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/if.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- if.vm 2000/10/23 21:18:28 1.2
+++ if.vm 2000/10/31 16:07:26 1.3
@@ -15,8 +15,8 @@
#if (false)
this is false
-#end
+#end
#if ($foo)
this isn't defined yet.
-#end
+#end
1.3 +3 -3 jakarta-velocity/test/templates/logical.vm
Index: logical.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/logical.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logical.vm 2000/10/23 21:18:28 1.2
+++ logical.vm 2000/10/31 16:07:26 1.3
@@ -13,7 +13,7 @@
#if ($foo > 1)
\$foo is greater then 1
-#end
+#end
#if ($foo < 10)
\$foo is less than 10
@@ -25,10 +25,10 @@
#if ($foo <= 5)
\$foo is less than or equal to 5
-#end
+#end
#set $foo = false
#if (!($foo == true))
foo is false
-#end
+#end
1.3 +1 -1 jakarta-velocity/test/templates/quotes.vm
Index: quotes.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/quotes.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quotes.vm 2000/10/23 21:18:28 1.2
+++ quotes.vm 2000/10/31 16:07:26 1.3
@@ -13,4 +13,4 @@
#if (true)
"what is $this"
-#end
+#end
1.3 +2 -1 jakarta-velocity/test/templates/test.vm
Index: test.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/test.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.vm 2000/10/23 21:18:28 1.2
+++ test.vm 2000/10/31 16:07:27 1.3
@@ -16,7 +16,7 @@
#if ($customer)
$customer.Name
-#end
+#end
## this is a comment.
@@ -115,6 +115,7 @@
$b
<input type="text" name="email" value="">
+<input type="text" name="email" value="$!schmarg">
#set $c = $provider.Title
1.4 +1 -6 jakarta-velocity/test/templates/compare/arithmetic.cmp
Index: arithmetic.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/arithmetic.cmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- arithmetic.cmp 2000/10/26 22:22:24 1.3
+++ arithmetic.cmp 2000/10/31 16:07:27 1.4
@@ -1,14 +1,9 @@
-
-
6
-
5
-
10
-
-5
\ No newline at end of file
+5
1.2 +23 -7 jakarta-velocity/test/templates/compare/block.cmp
Index: block.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/block.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.cmp 2000/10/24 02:02:41 1.1
+++ block.cmp 2000/10/31 16:07:27 1.2
@@ -1,20 +1,36 @@
+First test : spacing between stuff. Note that spacing preceeding the directives
counts!
+One blank line follows
+ this should be followed by two blank lines
+ this is the if statement. (followed by two blank lines)
- this
-
+
+ this is great (followed by a blank line, 4 spaces on a line,and 2 more, yes
there should be one after the 4 spaces)
+
+-- Second Test : no spacing between anything (1 blank line follows)
+ this
this is the if statement.
-
+ this is great (line w/ 4 spaces follows (from in front of the #end) +
another blank line)
-
- this is great
+-- Third Test : tight tight tight. Note that #end eats the \n, which is NOT what
people expect, I think.
+-- one blank line follows
-
+blargh This follows blarghblarghThis immedately follows blargh with a following
newline
-
+-- Fourth Test : another tight tight tight. Note that a space trailing the #end
does the trick.
+-- one blank line follows
+
+blargh This follows blargh
+blarghThis immedately follows blargh with a following newline
+
+-- Fifth Test : different kind of tight. blank line follows
+blargh
+blargh2
+blargh3
1.2 +6 -0 jakarta-velocity/test/templates/compare/diabolical.cmp
Index: diabolical.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/diabolical.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- diabolical.cmp 2000/10/31 02:57:59 1.1
+++ diabolical.cmp 2000/10/31 16:07:28 1.2
@@ -10,3 +10,9 @@
"#FFFFFF"
"$ow"
+"$row","var"
+#333333
+#FFFFFF
+"#FFFFF
+#FFFFF"
+
1.2 +0 -2 jakarta-velocity/test/templates/compare/directive.cmp
Index: directive.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/directive.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- directive.cmp 2000/10/24 02:02:41 1.1
+++ directive.cmp 2000/10/31 16:07:28 1.2
@@ -3,5 +3,3 @@
this is a dynamic directive!
-
-
1.2 +0 -10 jakarta-velocity/test/templates/compare/equality.cmp
Index: equality.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/equality.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- equality.cmp 2000/10/24 02:02:41 1.1
+++ equality.cmp 2000/10/31 16:07:28 1.2
@@ -1,21 +1,11 @@
-
-
-
the user jason is logged in!
-
-
the count is 5!
-
-
the user isn't logged in.
-
-
$count is not equal to 3
-
1.2 +1 -2 jakarta-velocity/test/templates/compare/escape.cmp
Index: escape.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/escape.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- escape.cmp 2000/10/24 02:02:41 1.1
+++ escape.cmp 2000/10/31 16:07:28 1.2
@@ -4,5 +4,4 @@
#set $foo = "bar"
-
-$foo => bar
\ No newline at end of file
+$foo => bar
1.2 +11 -3 jakarta-velocity/test/templates/compare/foreach-array.cmp
Index: foreach-array.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/foreach-array.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foreach-array.cmp 2000/10/24 02:02:41 1.1
+++ foreach-array.cmp 2000/10/31 16:07:28 1.2
@@ -1,10 +1,18 @@
-Foreach with an array.
+--Foreach with an array. 2 blank lines follow
-$stringarray
-
<table>
+ <tr>
+ <td>This is first element and it is the 1 item</td>
+ </tr>
+ <tr>
+ <td>This is second element and it is the 2 item</td>
+ </tr>
+</table>
+
+--Foreach with a null array. 1 blank line follows
+<table>
</table>
1.3 +0 -5 jakarta-velocity/test/templates/compare/foreach-method.cmp
Index: foreach-method.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/foreach-method.cmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- foreach-method.cmp 2000/10/31 02:43:04 1.2
+++ foreach-method.cmp 2000/10/31 16:07:28 1.3
@@ -2,12 +2,7 @@
Foreach with a method.
-
This is ArrayList element 1.
-
This is ArrayList element 2.
-
This is ArrayList element 3.
-
This is ArrayList element 4.
-
1.2 +4 -5 jakarta-velocity/test/templates/compare/foreach-variable.cmp
Index: foreach-variable.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/foreach-variable.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foreach-variable.cmp 2000/10/24 02:02:41 1.1
+++ foreach-variable.cmp 2000/10/31 16:07:28 1.2
@@ -2,12 +2,11 @@
Foreach with a variable.
-
This is ArrayList element 1.
- $velocityCount
+ 1
This is ArrayList element 2.
- $velocityCount
+ 2
This is ArrayList element 3.
- $velocityCount
+ 3
This is ArrayList element 4.
- $velocityCount
+ 4
1.2 +0 -2 jakarta-velocity/test/templates/compare/formal.cmp
Index: formal.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/formal.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formal.cmp 2000/10/24 02:02:41 1.1
+++ formal.cmp 2000/10/31 16:07:28 1.2
@@ -15,8 +15,6 @@
lunatic.map.lunaticMapBuilder
-
-
thisthat
lunatic}
1.2 +0 -4 jakarta-velocity/test/templates/compare/if.cmp
Index: if.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/if.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- if.cmp 2000/10/24 02:02:41 1.1
+++ if.cmp 2000/10/31 16:07:28 1.2
@@ -1,9 +1,5 @@
-
this is true
-
-
-
1.2 +0 -12 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logical.cmp 2000/10/24 02:02:41 1.1
+++ logical.cmp 2000/10/31 16:07:28 1.2
@@ -1,25 +1,13 @@
-
-
$foo is greater then 1
-
-
$foo is less than 10
-
-
$foo is great than or equal to 5
-
-
$foo is less than or equal to 5
-
-
-
foo is false
-
1.2 +1 -1 jakarta-velocity/test/templates/compare/method.cmp
Index: method.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/method.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- method.cmp 2000/10/24 02:02:41 1.1
+++ method.cmp 2000/10/31 16:07:28 1.2
@@ -1,3 +1,3 @@
-I am a running man
+I am a running man
\ No newline at end of file
1.2 +0 -3 jakarta-velocity/test/templates/compare/quotes.cmp
Index: quotes.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/quotes.cmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quotes.cmp 2000/10/24 02:02:41 1.1
+++ quotes.cmp 2000/10/31 16:07:28 1.2
@@ -1,7 +1,4 @@
-
-
"what is that"
-
1.3 +5 -10 jakarta-velocity/test/templates/compare/sample.cmp
Index: sample.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/sample.cmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sample.cmp 2000/10/27 05:37:43 1.2
+++ sample.cmp 2000/10/31 16:07:29 1.3
@@ -13,23 +13,18 @@
Names
</td>
</tr>
-
- <tr>
+ <tr>
<td bgcolor="#eeeeee">ArrayList element 1</td>
</tr>
-
- <tr>
+ <tr>
<td bgcolor="#eeeeee">ArrayList element 2</td>
</tr>
-
- <tr>
+ <tr>
<td bgcolor="#eeeeee">ArrayList element 3</td>
</tr>
-
- <tr>
+ <tr>
<td bgcolor="#eeeeee">ArrayList element 4</td>
</tr>
-
-</table>
+ </table>
</center>
</html>
1.3 +2 -49 jakarta-velocity/test/templates/compare/test.cmp
Index: test.cmp
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/compare/test.cmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.cmp 2000/10/31 02:43:04 1.2
+++ test.cmp 2000/10/31 16:07:29 1.3
@@ -5,31 +5,24 @@
jason
-
-
this is testing for wild loose commas , ,
$100
-
This is the bar way.
-
This is $bar.
-
-
This is the if.
-
#set $foo = "bar"
$foo => bar
@@ -43,11 +36,9 @@
$foo- => $foo-
$fooo+ => $fooo+
$foo-x => $foo-x
-$foo$ => bar$
+$foo$ => bar
-
-
jon
nothing here
@@ -70,53 +61,41 @@
}
-
<!-- This is an HTML comment -->
$provider2.Title
-
x
-
-
x
<input type="text" name="email" value="">
-
-
+<input type="text" name="email" value="">
lunatic
-
lunatic
-
crocodile hunter!
<!-- look here -->
-
-
lunatic
-
-
jason
-
jason
@@ -127,66 +106,42 @@
-
-
-
-
-
This is a property that returns a boolean
value of true.
-
-
This expression is always (true).
-
Foreach with a variable.
-
This is ArrayList element 1.
-
This is ArrayList element 2.
-
This is ArrayList element 3.
-
This is ArrayList element 4.
-
Foreach with an array.
<table>
-
<tr>
<td>This is first element</td>
</tr>
-
<tr>
<td>This is second element</td>
</tr>
-
</table>
-
This is the vector element 1.
-
This is the vector element 2.
-
Foreach with a method.
-
This is ArrayList element 1.
-
This is ArrayList element 2.
-
This is ArrayList element 3.
-
This is ArrayList element 4.
-
$10.00
"this is great"
@@ -200,9 +155,7 @@
I am a jason.
-
Yes the APL rules!
-
</body>
</html>
