Author: nbubna
Date: Fri Jan 23 09:23:55 2009
New Revision: 737101
URL: http://svn.apache.org/viewvc?rev=737101&view=rev
Log:
added my #evaluate in #macro tests, broken one commented out
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java?rev=737101&r1=737100&r2=737101&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
Fri Jan 23 09:23:55 2009
@@ -38,4 +38,24 @@
engine.setProperty(RuntimeConstants.VM_PERM_INLINE_LOCAL, true);
//assertEvalEquals("foo1foo2", "#macro(eval
$e)#evaluate($e)#end#eval('foo1')#eval('foo2')");
}
+
+ public void test682b()
+ {
+ String template = "#macro( eval $e )#evaluate($e)#end" +
+ "#eval('foo')" +
+ "#eval('bar')";
+ String expected = "foo"+
+ "bar";
+ assertEvalEquals(expected, template);
+ }
+
+ public void test682c()
+ {
+ String template = "#macro( eval $e )#evaluate($e)#end" +
+ "\n#eval('foo')" +
+ "\n#eval('bar')";
+ String expected = "\nfoo"+
+ "\nbar";
+ //assertEvalEquals(expected, template);
+ }
}