Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,19 +19,18 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Load templates from the Classpath. *
Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Multiple paths in the file resource loader. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.math.BigDecimal; -import java.math.BigInteger; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.test.provider.NumberMethods; +import java.io.StringWriter; +import java.math.BigDecimal; +import java.math.BigInteger; + /** * Used to check that method calls with number parameters are executed correctly. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,9 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.io.Writer; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -29,6 +26,9 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.runtime.RuntimeConstants; +import java.io.StringWriter; +import java.io.Writer; + /** * Test parser exception is generated with appropriate info. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java Sun Jul 17 23:33:09 2016 @@ -18,15 +18,18 @@ */ package org.apache.velocity.test; -import org.apache.velocity.app.VelocityEngine; +import junit.framework.TestSuite; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogger; +import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.Template; -import junit.framework.TestSuite; +import org.apache.velocity.test.misc.TestLogger; -import java.io.*; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; /** * Test case for including macro libraries via the #parse method. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParserTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParserTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParserTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ParserTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.util.Map; -import java.util.HashMap; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.misc.TestLogger; +import java.io.StringWriter; +import java.util.HashMap; +import java.util.Map; + /** * More specific parser tests where just templating * isn't enough. Added: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java?rev=1753137&view=auto ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java (added) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java Sun Jul 17 23:33:09 2016 @@ -0,0 +1,155 @@ +package org.apache.velocity.test; + +import junit.framework.Assert; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; + +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +public class RenderVelocityTemplateTest +{ + + static class RenderVelocityTemplate + { + static + { + try + { + Properties p = new Properties(); + p.put("velocimacro.permissions.allow.inline.local.scope", "true"); + Velocity.init(p); + } + catch (Exception e) + { + throw new AssertionError("Failed to init Velocity"); + } + } + + private final VelocityContext velocityContext = new VelocityContext(); + + private final String template; + + public RenderVelocityTemplate(String template) + { + this.template = template; + } + + public String getContent() + throws Exception + { + StringWriter stringWriter = new StringWriter(); + Velocity.evaluate(velocityContext, stringWriter, "", template); + return stringWriter.toString(); + } + } + + + private static final String templateString = "" + // + "#macro (showhelloworld $foo)\n" + // + "Hello, World\n" + // + "#end\n" + // + "\n" + // + "<html>\n" + // + "<head>\n" + // + "<title>page title</title>\n" + // + "</head>\n" + // + "<body>\n" + // + "<p>This is a test</p>\n" + // + "<p>#showhelloworld ($foo)</p>\n" + // + "</body>\n" + // + "</html>"; + + public void testMultipleEvals() + throws Exception + { + RenderVelocityTemplate template = new RenderVelocityTemplate(templateString); + + String result = null; + for (int i = 0; i < 1000; ++i) + { + result = template.getContent(); + + // Verify that the original macro invocation has been replaced with its result. + int index = result.indexOf("#showhelloworld"); + if (index != -1) + { + throw new AssertionError("Failed to substitute macro:\n" + result); + } + + // Verify that the macro did indeed expand. + int indexHW = result.indexOf("<p>Hello, World"); + Assert.assertTrue(indexHW >= 0); + + // Assert.assertEquals("", result); // enable to show what we really get + } + } + + /** Helper class for testMultiThreadMultipleEvals(). */ + static class ExceptionHandler + implements Thread.UncaughtExceptionHandler + { + List<Throwable> errors = new ArrayList<Throwable>(); + + public void uncaughtException(Thread t, Throwable e) + { + errors.add(e); + } + } + + /** Helper class for testMultiThreadMultipleEvals(). */ + class RunMultipleEvals + extends Thread + { + @Override + public void run() + { + try + { + testMultipleEvals(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + } + + /** + * Spawn multiple threads that concurrently call testMultipleEvals. + */ + public void testMultiThreadMultipleEvals() + throws Throwable + { + int nthreads = 4; + ExceptionHandler eh = new ExceptionHandler(); + + List<Thread> threads = new ArrayList<Thread>(nthreads); + for (int i = 0; i < nthreads; ++i) + { + Thread t = new RunMultipleEvals(); + t.setUncaughtExceptionHandler(eh); + threads.add(t); + } + + for (Thread t : threads) + { + t.start(); + } + + for (Thread t : threads) + { + t.join(); + } + + if (eh.errors.size() > 0) + { + // Rethrow the first failing exception. + System.out.println("Failed " + eh.errors.size() + " out of " + nthreads + " template evaluations"); + Throwable t = eh.errors.get(0); + throw t; + } + } +} Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,14 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.test.TemplateTestBase; + +import java.io.StringWriter; +import java.io.Writer; /** * Test resource caching related issues. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -36,6 +30,11 @@ import org.apache.velocity.runtime.resou import org.apache.velocity.runtime.resource.loader.ResourceLoader2; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; + /** * Test that an instance of a ResourceLoader2 can be successfully passed in. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,11 @@ package org.apache.velocity.test; * under the License. */ -import java.util.HashMap; - import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; +import java.util.HashMap; + /** * This class tests the directive scope controls */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SecureIntrospectionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SecureIntrospectionTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SecureIntrospectionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SecureIntrospectionTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Collection; -import java.util.HashSet; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; @@ -37,6 +30,12 @@ import org.apache.velocity.exception.Res import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.util.introspection.SecureUberspector; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Collection; +import java.util.HashSet; + /** * Checks that the secure introspector is working properly. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,13 @@ package org.apache.velocity.test; * under the License. */ +import org.apache.velocity.Template; +import org.apache.velocity.runtime.RuntimeConstants; + import java.io.BufferedWriter; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import org.apache.velocity.Template; -import org.apache.velocity.runtime.RuntimeConstants; /** * Test that an instance of a ResourceLoader can be successfully passed in. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,10 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.test.TemplateTestBase; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.test.misc.TestLogger; /** * Test the #stop directive Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,12 @@ package org.apache.velocity.test; * under the License. */ -import java.util.ArrayList; -import java.util.Iterator; - import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; +import java.util.ArrayList; +import java.util.Iterator; + /** * This class tests support for strict foreach mode. */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java Sun Jul 17 23:33:09 2016 @@ -20,8 +20,8 @@ package org.apache.velocity.test; */ import org.apache.velocity.exception.MethodInvocationException; -import org.apache.velocity.exception.VelocityException; import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,7 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.TestCase; -import org.slf4j.impl.SimpleLogger; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -34,6 +30,8 @@ import org.apache.velocity.runtime.resou import org.apache.velocity.runtime.resource.util.StringResourceRepositoryImpl; import org.apache.velocity.test.misc.TestLogger; +import java.io.StringWriter; + /** * Tests ability to have multiple repositories in the same app. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,19 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.runtime.resource.loader.StringResourceLoader; +import org.apache.velocity.test.misc.TestLogger; + +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; /** * Multiple paths in the file resource loader. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,20 +19,10 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Vector; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.FieldMethodizer; import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.test.provider.BoolObj; @@ -40,6 +30,15 @@ import org.apache.velocity.test.provider import org.apache.velocity.test.provider.TestNumber; import org.apache.velocity.test.provider.TestProvider; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Vector; + /** * Easily add test cases which evaluate templates and check their output. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestSuite.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestSuite.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestSuite.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestSuite.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,10 @@ package org.apache.velocity.test; * under the License. */ -import java.io.FileInputStream; -import java.util.Properties; - import junit.framework.TestSuite; -import org.apache.velocity.app.Velocity; +import java.io.FileInputStream; +import java.util.Properties; /** * Test suite for Templates. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TestBaseTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TestBaseTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TestBaseTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/TestBaseTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,11 +19,11 @@ package org.apache.velocity.test; * under the License. */ -import java.io.File; - import junit.framework.Test; import junit.framework.TestSuite; +import java.io.File; + /** * I keep breaking the getFileName method all the time... */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,8 @@ package org.apache.velocity.test; * under the License. */ -import java.util.HashMap; -import java.util.Map; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.runtime.RuntimeInstance; import org.apache.velocity.test.misc.GetPutObject; import org.apache.velocity.test.misc.UberspectorTestObject; @@ -32,6 +28,9 @@ import org.apache.velocity.util.introspe import org.apache.velocity.util.introspection.VelPropertyGet; import org.apache.velocity.util.introspection.VelPropertySet; +import java.util.HashMap; +import java.util.Map; + public class UberspectorTestCase extends BaseTestCase Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UnicodeEscapeTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UnicodeEscapeTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UnicodeEscapeTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/UnicodeEscapeTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,7 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.runtime.parser.node.ASTStringLiteral; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,7 @@ package org.apache.velocity.test; * under the License. */ -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; - import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -36,6 +27,14 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; + /** * Macro library inclution via the Template.merge method is tested using this * class. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,17 +19,16 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; -import org.apache.velocity.exception.MacroOverflowException; import org.apache.velocity.app.Velocity; +import org.apache.velocity.exception.MacroOverflowException; import org.apache.velocity.test.misc.TestLogger; +import java.io.StringWriter; + /** * This class tests strange Velocimacro issues. * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocityAppTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocityAppTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocityAppTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocityAppTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,14 +19,10 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; - -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogger; + +import java.io.StringWriter; /** * This class is intended to test the app.Velocity.java class. @@ -46,48 +42,39 @@ public class VelocityAppTestCase extends super(name); } - public void setUp() + public void testVelocityApp() throws Exception { - Velocity.setProperty( - Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); - - Velocity.setProperty( - Velocity.RUNTIME_LOG_INSTANCE, new TestLogger()); + engine.setProperty(Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); + engine.init(); - Velocity.init(); - } + // the usage of engine here is equivalent to using static calls to Velocity. class - public static Test suite() - { - return new TestSuite(VelocityAppTestCase.class); - } - - /** - * Runs the test. - */ - public void testVelocityApp () - throws Exception - { VelocityContext context = new VelocityContext(); context.put("name", "jason"); context.put("Floog", "floogie woogie"); - Velocity.evaluate(context, compare1, "evaltest", input1); + String cmp = "Hello jason! Nice floogie woogie!"; -/* - * @todo FIXME: Not tested right now. - * - * StringWriter result2 = new StringWriter(); - * Velocity.mergeTemplate("mergethis.vm", context, result2); - * - * StringWriter result3 = new StringWriter(); - * Velocity.invokeVelocimacro("floog", "test", new String[2], - * context, result3); - */ - if (!result1.equals(compare1.toString())) - { - fail("Output incorrect."); - } + engine.evaluate(context, compare1, "evaltest", input1); + if (!result1.equals(compare1.toString())) + { + fail("Output 1 incorrect."); + } + + StringWriter result2 = new StringWriter(); + engine.mergeTemplate("mergethis.vm", "UTF-8", context, result2); + if (!result2.toString().equals(cmp)) + { + fail("Output 2 incorrect."); + } + + StringWriter result3 = new StringWriter(); + engine.invokeVelocimacro("floog", "test", new String[]{"name", "Floog"}, context, result3); + + if (!result3.toString().equals(cmp)) + { + fail("Output 3 incorrect."); + } } } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,7 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import java.io.StringWriter; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; @@ -28,6 +27,8 @@ import org.apache.velocity.context.Conte import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.test.provider.TestProvider; +import java.io.StringWriter; + /** * Test thrown exceptions include a proper cause (under JDK 1.4+). * Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,19 +19,18 @@ package org.apache.velocity.test.issues; * under the License. */ -import java.lang.reflect.Method; -import java.security.AccessControlException; -import java.security.Permission; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeInstance; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.test.BaseTestCase; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.Introspector; +import java.lang.reflect.Method; +import java.security.AccessControlException; +import java.security.Permission; + /** * Test Case for <a href="https://issues.apache.org/jira/browse/VELTOOLS-66";>Velocity Tools Issue 66</a>. */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java Sun Jul 17 23:33:09 2016 @@ -10,15 +10,8 @@ package org.apache.velocity.test.issues; * governing permissions and limitations under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -26,6 +19,12 @@ import org.apache.velocity.app.VelocityE import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.test.misc.TestLogger; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; + /** * Test Case for <a href="https://issues.apache.org/jira/browse/VELOCITY-537";>Velocity Issue 537</a>. */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java Sun Jul 17 23:33:09 2016 @@ -21,7 +21,6 @@ package org.apache.velocity.test.issues; import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.test.BaseTestCase; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java Sun Jul 17 23:33:09 2016 @@ -10,21 +10,20 @@ package org.apache.velocity.test.issues; * governing permissions and limitations under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.test.BaseTestCase; +import org.apache.velocity.test.misc.TestLogger; + +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; /** * Test Case for <a href="https://issues.apache.org/jira/browse/VELOCITY-580";>Velocity Issue 580</a>. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-627. Make sure Foreach Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,7 +19,6 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.BaseTestCase; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-644. Make sure the reported filename Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity682TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity682TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity682TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity682TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-682. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity709TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity709TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity709TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity709TestCase.java Sun Jul 17 23:33:09 2016 @@ -20,7 +20,6 @@ package org.apache.velocity.test.issues; */ import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.exception.VelocityException; /** * This class tests VELOCITY-709. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity727TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity727TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity727TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity727TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-727. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity728TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity728TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity728TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity728TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,8 +19,8 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.exception.VelocityException; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-728. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity729TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity729TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity729TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity729TestCase.java Sun Jul 17 23:33:09 2016 @@ -20,7 +20,6 @@ package org.apache.velocity.test.issues; */ import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.exception.VelocityException; /** * This class tests VELOCITY-729. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java Sun Jul 17 23:33:09 2016 @@ -20,8 +20,8 @@ package org.apache.velocity.test.issues; */ import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.test.BaseTestCase; /** * This class tests VELOCITY-742. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity753TestCase.java Sun Jul 17 23:33:09 2016 @@ -19,7 +19,6 @@ package org.apache.velocity.test.issues; * under the License. */ -import java.text.NumberFormat; import org.apache.velocity.test.BaseTestCase; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java Sun Jul 17 23:33:09 2016 @@ -21,8 +21,6 @@ package org.apache.velocity.test.issues; import org.apache.velocity.app.event.EventCartridge; import org.apache.velocity.app.event.IncludeEventHandler; -import org.apache.velocity.context.Context; -import org.apache.velocity.exception.VelocityException; import org.apache.velocity.test.BaseTestCase; /** Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity785TestCase.java Sun Jul 17 23:33:09 2016 @@ -20,7 +20,6 @@ package org.apache.velocity.test.issues; */ import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.exception.VelocityException; /** * This class tests VELOCITY-785. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java Sun Jul 17 23:33:09 2016 @@ -19,9 +19,6 @@ package org.apache.velocity.test.misc; * under the License. */ -import java.io.IOException; -import java.io.Writer; - import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.exception.MethodInvocationException; import org.apache.velocity.exception.ParseErrorException; @@ -29,6 +26,9 @@ import org.apache.velocity.exception.Res import org.apache.velocity.runtime.directive.Directive; import org.apache.velocity.runtime.parser.node.Node; +import java.io.IOException; +import java.io.Writer; + /** * that always throws an exception. Used to test * that RuntimeExceptions are passed through. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java Sun Jul 17 23:33:09 2016 @@ -19,13 +19,13 @@ package org.apache.velocity.test.misc; * under the License. */ -import java.io.Reader; - import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.loader.ResourceLoader2; import org.apache.velocity.util.ExtProperties; +import java.io.Reader; + /** * Resource Loader that always throws an exception. Used to test * that RuntimeExceptions are passed through. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,12 @@ package org.apache.velocity.test.misc; * under the License. */ -import java.util.HashMap; -import java.util.Map; - import org.apache.velocity.VelocityContext; import org.apache.velocity.context.Context; +import java.util.HashMap; +import java.util.Map; + /** * Used for testing EvaluateContext. For testing purposes, this is a case insensitive * context. Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java Sun Jul 17 23:33:09 2016 @@ -19,16 +19,13 @@ package org.apache.velocity.test.misc; * under the License. */ -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -import org.slf4j.Logger; import org.slf4j.helpers.FormattingTuple; import org.slf4j.helpers.MarkerIgnoringBase; import org.slf4j.helpers.MessageFormatter; import org.slf4j.spi.LocationAwareLogger; -import org.apache.velocity.runtime.RuntimeServices; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; /** * Logger implementation that can easily capture output Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/BaseSQLTest.java Sun Jul 17 23:33:09 2016 @@ -19,12 +19,12 @@ package org.apache.velocity.test.sql; * under the License. */ +import org.apache.velocity.test.BaseTestCase; + import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import org.apache.velocity.test.BaseTestCase; - /** * A base class to implement tests that need a running * Velocity engine and an initialized Hsql Database. Yeah, I should probably Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java Sun Jul 17 23:33:09 2016 @@ -19,23 +19,21 @@ package org.apache.velocity.test.sql; * under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; - -import javax.sql.DataSource; - import junit.framework.Test; import junit.framework.TestSuite; - import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.runtime.resource.loader.DataSourceResourceLoader; +import org.apache.velocity.test.misc.TestLogger; + +import javax.sql.DataSource; +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; public class DataSourceResourceLoaderTestCase Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDB.java Sun Jul 17 23:33:09 2016 @@ -23,7 +23,6 @@ import org.apache.commons.lang3.StringUt import org.hsqldb.jdbcDriver; import java.io.FileReader; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/HsqlDataSource.java Sun Jul 17 23:33:09 2016 @@ -19,6 +19,9 @@ package org.apache.velocity.test.sql; * under the License. */ +import org.hsqldb.jdbcDriver; + +import javax.sql.DataSource; import java.io.PrintWriter; import java.sql.Connection; import java.sql.DriverManager; @@ -26,10 +29,6 @@ import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; -import javax.sql.DataSource; - -import org.hsqldb.jdbcDriver; - public class HsqlDataSource implements DataSource { private final String url; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java Sun Jul 17 23:33:09 2016 @@ -21,11 +21,15 @@ package org.apache.velocity.test.util.in import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogger; -import org.apache.velocity.util.introspection.*; import org.apache.velocity.test.BaseTestCase; -import org.apache.velocity.VelocityContext; +import org.apache.velocity.test.misc.TestLogger; +import org.apache.velocity.util.introspection.AbstractChainableUberspector; +import org.apache.velocity.util.introspection.Info; +import org.apache.velocity.util.introspection.UberspectImpl; +import org.apache.velocity.util.introspection.VelPropertyGet; +import org.apache.velocity.util.introspection.VelPropertySet; import java.io.StringWriter; Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java Sun Jul 17 23:33:09 2016 @@ -21,11 +21,11 @@ package org.apache.velocity.test.util.in import junit.framework.Test; import junit.framework.TestSuite; -import org.slf4j.Logger; import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.test.BaseTestCase; +import org.apache.velocity.test.misc.TestLogger; import org.apache.velocity.util.introspection.ClassMap; +import org.slf4j.Logger; /** * Test the ClassMap Lookup Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java Sun Jul 17 23:33:09 2016 @@ -1,15 +1,17 @@ package org.apache.velocity.test.util.introspection; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.Iterator; - +import junit.framework.Test; +import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.test.BaseTestCase; import org.apache.velocity.test.misc.TestLogger; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Iterator; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -29,9 +31,6 @@ import org.apache.velocity.test.misc.Tes * under the License. */ -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Tests the default uberspector. */ Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java?rev=1753137&r1=1753136&r2=1753137&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/view/TemplateNodeView.java Sun Jul 17 23:33:09 2016 @@ -19,15 +19,16 @@ package org.apache.velocity.test.view; * under the License. */ +import org.apache.velocity.Template; +import org.apache.velocity.runtime.RuntimeSingleton; +import org.apache.velocity.runtime.parser.node.SimpleNode; +import org.apache.velocity.runtime.visitor.NodeViewMode; + import java.io.BufferedReader; import java.io.FileInputStream; import java.io.InputStreamReader; import java.io.PrintWriter; -import org.apache.velocity.runtime.RuntimeSingleton; -import org.apache.velocity.runtime.parser.node.SimpleNode; -import org.apache.velocity.runtime.visitor.NodeViewMode; - /** * Simple class for dumping the AST for a template. * Good for debugging and writing new directives. @@ -54,19 +55,21 @@ public class TemplateNodeView * the node structure and then produces the * visual representation by the visitation. */ - public TemplateNodeView(String template) + public TemplateNodeView(String templateFile) { try { RuntimeSingleton.init("velocity.properties"); InputStreamReader isr = new InputStreamReader( - new FileInputStream(template), + new FileInputStream(templateFile), RuntimeSingleton.getString(RuntimeSingleton.INPUT_ENCODING)); BufferedReader br = new BufferedReader( isr ); - document = RuntimeSingleton.parse( br, template); + Template tmpl = new Template(); + tmpl.setName(templateFile); + document = RuntimeSingleton.parse( br, tmpl); visitor = new NodeViewMode(); visitor.setContext(null); Added: velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/mergethis.vm URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/mergethis.vm?rev=1753137&view=auto ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/mergethis.vm (added) +++ velocity/engine/trunk/velocity-engine-core/src/test/resources/templates/mergethis.vm Sun Jul 17 23:33:09 2016 @@ -0,0 +1 @@ +#macro(floog $foo $bar)Hello $foo! Nice $bar!#{end}#floog($name $Floog) \ No newline at end of file
