Repository: logging-log4j2 Updated Branches: refs/heads/master 2741e01c9 -> b28ff4fae
Javadoc and better lvar. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b28ff4fa Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b28ff4fa Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b28ff4fa Branch: refs/heads/master Commit: b28ff4fae7bd1bed91cc38c19244a23a879fe159 Parents: 2741e01 Author: Gary Gregory <[email protected]> Authored: Mon Nov 17 21:57:01 2014 -0500 Committer: Gary Gregory <[email protected]> Committed: Mon Nov 17 21:57:01 2014 -0500 ---------------------------------------------------------------------- .../src/test/java/org/apache/log4j/VelocityTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b28ff4fa/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java index e595ab0..74f977a 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java @@ -30,7 +30,7 @@ import org.junit.BeforeClass; import org.junit.Test; /** - * + * Note that this test must clean up after itself or it may cause other tests to fail. */ public class VelocityTest { @@ -50,13 +50,13 @@ private static LoggerContext context; @Test public void testVelocity() { Velocity.init(); - final VelocityContext context = new VelocityContext(); - context.put("name", new String("Velocity")); + final VelocityContext vContext = new VelocityContext(); + vContext.put("name", new String("Velocity")); final Template template = Velocity.getTemplate("target/test-classes/hello.vm"); final StringWriter sw = new StringWriter(); - template.merge(context, sw); + template.merge(vContext, sw); } }
