geirm 00/11/02 19:28:32
Modified: test/templates block.vm escape.vm pedantic.vm
test/templates/compare escape.cmp test.cmp
Log:
Corrections to work with the new escape rules.
Revision Changes Path
1.4 +1 -1 jakarta-velocity/test/templates/block.vm
Index: block.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/block.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.vm 2000/10/31 16:07:26 1.3
+++ block.vm 2000/11/03 03:28:25 1.4
@@ -65,7 +65,7 @@
this is the else statement
#end
--- Third Test : tight tight tight. Note that \#end eats the \\n, which is NOT what
people expect, I think.
+-- 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
1.3 +41 -3 jakarta-velocity/test/templates/escape.vm
Index: escape.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/escape.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- escape.vm 2000/10/23 21:18:27 1.2
+++ escape.vm 2000/11/03 03:28:26 1.3
@@ -11,7 +11,45 @@
\A
-\#set $foo = "bar"
-#set $foo = "bar"
+\#set $woo = "bar"
+#set $woo = "bar"
-\$foo => $foo
+\$woo => $woo
+
+The following should print 'as is' :
+$f\oo
+\a
+"\r"
+
+Now, test the built in directives. Note that $foo isn't in the context :
+\#set $foo = $foo + 1
+\#set \$foo = $foo + 1
+\#if($foo)
+\#if ( $foo )
+\#else
+\#end
+\#elseif(
+
+Now, a reference not in the context:
+\$foo -> $foo
+\#if($foo)
+\#if(\$foo)
+
+Put it in :
+#set $foo = 1
+\$foo -> $foo
+\#if($foo)
+\#if(\$foo)
+
+This isn't in the context, so we get the full monty :
+ \$woobie.blagh()
+
+The following two are references :
+ \$provider.Title = $provider.Title
+ \$provider.getTitle() = $provider.getTitle()
+
+Now, pluggable directives:
+
+\#notadirective
+\#foreach
+
1.3 +1 -1 jakarta-velocity/test/templates/pedantic.vm
Index: pedantic.vm
===================================================================
RCS file: /home/cvs/jakarta-velocity/test/templates/pedantic.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pedantic.vm 2000/10/31 16:19:45 1.2
+++ pedantic.vm 2000/11/03 03:28:26 1.3
@@ -16,7 +16,7 @@
Like get the spacing between things #foreach($a in $stringarray)$a#end to be
really, really tight.
-Further, it now binds any \\n to the control structures, taking them out of the
output.
+Further, it now binds any \n to the control structures, taking them out of the
output.
The hope that this is What You Expect.
So...
1.3 +40 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- escape.cmp 2000/10/31 16:07:28 1.2
+++ escape.cmp 2000/11/03 03:28:30 1.3
@@ -1,7 +1,44 @@
-A
+\A
-#set $foo = "bar"
+#set $woo = "bar"
-$foo => bar
+$woo => bar
+
+The following should print 'as is' :
+$f\oo
+\a
+"\r"
+
+Now, test the built in directives. Note that $foo isn't in the context :
+#set $foo = $foo + 1
+#set \$foo = $foo + 1
+#if($foo)
+#if ( $foo )
+#else
+#end
+#elseif(
+
+Now, a reference not in the context:
+\$foo -> $foo
+#if($foo)
+#if(\$foo)
+
+Put it in :
+$foo -> 1
+#if(1)
+#if($foo)
+
+This isn't in the context, so we get the full monty :
+ \$woobie.blagh()
+
+The following two are references :
+ $provider.Title = lunatic
+ $provider.getTitle() = lunatic
+
+Now, pluggable directives:
+
+\#notadirective
+#foreach
+
1.4 +7 -7 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test.cmp 2000/10/31 16:07:29 1.3
+++ test.cmp 2000/11/03 03:28:30 1.4
@@ -30,12 +30,12 @@
$foo. => bar.
$foo.. => bar..
$foo/ => bar/
-$foo" => bar"
-$foo => bar\
+$foo" => $foo"
+$foo\ => bar\
$foo< => bar<
-$foo- => $foo-
-$fooo+ => $fooo+
-$foo-x => $foo-x
+\$foo- => $foo-
+\$fooo+ => $fooo+
+\$foo-x => $foo-x
$foo$ => bar
@@ -148,8 +148,8 @@
(this is also great)
-This is the #stuff and this
-is the way #to #go.
+This is the \#stuff and this
+is the way \#to \#go.
this = that
