diff options
| author | Claude Brisson <claude@renegat.net> | 2021-02-25 22:37:13 +0100 |
|---|---|---|
| committer | Claude Brisson <claude@renegat.net> | 2021-02-25 22:37:13 +0100 |
| commit | a61a40d14d7cdc9e170165445b09eef1cd5f323a (patch) | |
| tree | 0ee051d0d47344d266c04e64bd32efe734139ea6 /velocity-engine-core/src/test/java/org/apache/velocity | |
| parent | 98895094e7f52c4fba9956c3508f934ae2274e97 (diff) | |
| parent | 836d28fa2e3884c72e20d7f42941c58031416b18 (diff) | |
| download | apache-velocity-engine-a61a40d14d7cdc9e170165445b09eef1cd5f323a.tar.gz | |
Merge feature/fix-some-generics
Diffstat (limited to 'velocity-engine-core/src/test/java/org/apache/velocity')
107 files changed, 256 insertions, 118 deletions
diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java index d010cfec..abfe75cc 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java @@ -86,6 +86,7 @@ public class AbsoluteFileResourceLoaderTestCase extends BaseTestCase /** * Runs the test. */ + @Override public void runTest () { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java index 0db00c09..877b93ac 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/AlternateValuesTestCase.java @@ -19,23 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import junit.framework.TestCase; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.StringResourceLoader; -import org.apache.velocity.runtime.resource.util.StringResourceRepository; -import org.apache.velocity.test.misc.TestLogger; - -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.Locale; - /** * Base test case that provides utility methods for * the rest of the tests. diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java index 54d53065..ceb82e80 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ArrayMethodsTestCase.java @@ -50,7 +50,7 @@ public class ArrayMethodsTestCase extends BaseTestCase checkResults(array, 11, false); // test an array of mixed objects, including null - array = new Object[] { new Double(2.2), null }; + array = new Object[] { 2.2, null }; checkResults(array, "whatever", true); // then set all the values to null checkResults(array, null, true); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java index f2eb297d..c6456dff 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java @@ -80,6 +80,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase return ret; } + @Override protected void setUp() throws Exception { //by default, make the engine's log output go to the test-report @@ -124,6 +125,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase getStringRepository().removeStringResource(name); } + @Override public void tearDown() { engine = null; @@ -225,7 +227,7 @@ public abstract class BaseTestCase extends TestCase implements TemplateTestBase /** * Ensure that a specified type of exception occurs when evaluating the string. */ - protected Exception assertEvalException(String evil, Class exceptionType) + protected Exception assertEvalException(String evil, Class<?> exceptionType) { try { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java index 206875b3..0f0cb616 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BreakDirectiveTestCase.java @@ -31,6 +31,7 @@ public class BreakDirectiveTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty("a.provide.scope.control", "true"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java index ad946418..63e10676 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/BuiltInEventHandlerTestCase.java @@ -92,6 +92,7 @@ public class BuiltInEventHandlerTestCase extends BaseTestCase { super(name); } + @Override public void setUp() throws Exception { assureResultsDirectoryExists(RESULTS_DIR); @@ -410,7 +411,7 @@ public class BuiltInEventHandlerTestCase extends BaseTestCase { assertEquals("Jimmy's <b>pizza</b>",writer.toString()); // comment out bad test -- requires latest commons-lang - /** + /* // JavaScript and HTML writer = new StringWriter(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java index d6f7b2d3..096dbe7b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClassloaderChangeTestCase.java @@ -53,6 +53,7 @@ public class ClassloaderChangeTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { @@ -159,6 +160,7 @@ public class ClassloaderChangeTestCase extends TestCase } + @Override public Class<?> findClass(String name) { return fooClass; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java index 98c20fb5..41285fab 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ClasspathResourceTestCase.java @@ -74,6 +74,7 @@ public class ClasspathResourceTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java index 3697a292..f427f4f7 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextAutoreferenceKeyTestCase.java @@ -33,11 +33,13 @@ public class ContextAutoreferenceKeyTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty(VelocityEngine.CONTEXT_AUTOREFERENCE_KEY, "self"); } + @Override protected void setUpContext(VelocityContext context) { context.put("foo", "bar"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java index 859108cb..a30c2940 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ContextSafetyTestCase.java @@ -53,6 +53,7 @@ public class ContextSafetyTestCase extends BaseTestCase implements TemplateTestB super(name); } + @Override public void setUp() throws Exception { @@ -81,11 +82,11 @@ public class ContextSafetyTestCase extends BaseTestCase implements TemplateTestB * make a Vector and String array because * they are treated differently in Foreach() */ - Vector v = new Vector(); + Vector<String> v = new Vector(); - v.addElement( new String("vector hello 1") ); - v.addElement( new String("vector hello 2") ); - v.addElement( new String("vector hello 3") ); + v.addElement("vector hello 1"); + v.addElement( "vector hello 2"); + v.addElement( "vector hello 3"); String strArray[] = new String[3]; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java index 141d7180..bc056222 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EncodingTestCase.java @@ -30,6 +30,7 @@ import java.io.BufferedWriter; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; /** * Tests input encoding handling. The input target is UTF-8, having @@ -48,6 +49,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase super(name); } + @Override public void setUp() throws Exception { @@ -94,7 +96,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase new FileOutputStream ( getFileName(RESULT_DIR, "encodingtest", RESULT_FILE_EXT)); - Writer writer = new BufferedWriter(new OutputStreamWriter(fos, "UTF-8")); + Writer writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8)); template.merge(context, writer); writer.flush(); @@ -125,7 +127,7 @@ public class EncodingTestCase extends BaseTestCase implements TemplateTestBase new FileOutputStream ( getFileName(RESULT_DIR, "encodingtest2", RESULT_FILE_EXT)); - Writer writer = new BufferedWriter(new OutputStreamWriter(fos, "UTF-8")); + Writer writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8)); template.merge(context, writer); writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java index cc961996..fc5c1d1b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EvaluateTestCase.java @@ -33,7 +33,6 @@ import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; /** @@ -85,6 +84,7 @@ public class EvaluateTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java index a0ba2704..ef3bfcdf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/EventHandlingTestCase.java @@ -52,7 +52,7 @@ public class EventHandlingTestCase extends BaseTestCase throws Exception { TestEventCartridge te = new TestEventCartridge(); - /** + /* * Test attaching the event cartridge to the context. * Make an event cartridge, register all the * event handlers (at once) and attach it to the @@ -186,7 +186,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Required by EventHandler */ - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { // make sure this is only called once if (this.rs == null) @@ -199,7 +200,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Event handler for when a reference is inserted into the output stream. */ - public Object referenceInsert( Context context, String reference, Object value ) + @Override + public Object referenceInsert(Context context, String reference, Object value ) { // as a test, make sure this EventHandler is initialized if (rs == null) @@ -233,7 +235,8 @@ public class EventHandlingTestCase extends BaseTestCase /** * Handles exceptions thrown during in-template method access */ - public Object methodException( Context context, Class claz, String method, Exception e, Info info ) + @Override + public Object methodException(Context context, Class claz, String method, Exception e, Info info ) { // as a test, make sure this EventHandler is initialized if (rs == null) @@ -259,6 +262,7 @@ public class EventHandlingTestCase extends BaseTestCase Context context; + @Override public void setContext(Context context) { this.context = context; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java index 44ef1fd5..2816799a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ExpressionAsMethodArgumentTestCase.java @@ -32,6 +32,7 @@ public class ExpressionAsMethodArgumentTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("tool",new MyAbsTool()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java index 82995217..e56fa733 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/FilteredEventHandlingTestCase.java @@ -101,7 +101,7 @@ public class FilteredEventHandlingTestCase extends BaseTestCase assureResultsDirectoryExists(RESULTS_DIR); - /** + /* * Set up two VelocityEngines that will apply the handlers in both orders */ VelocityEngine ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java index e1fdce19..e4ccc7f9 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/HyphenInIdentifiersTestCase.java @@ -19,7 +19,6 @@ package org.apache.velocity.test; * under the License. */ -import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; /** @@ -33,6 +32,7 @@ public class HyphenInIdentifiersTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.addProperty("parser.allow_hyphen_in_identifiers", true); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java index 2f6832b0..2935100c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfEmptyNoEmptyCheckTestCase.java @@ -22,13 +22,7 @@ package org.apache.velocity.test; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; /** * Used to check that empty values are properly handled in #if statements diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java index d34a53ec..f1ce938d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IfNullTestCase.java @@ -31,6 +31,7 @@ public class IfNullTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("nullToString", new NullToString()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java index ee8ee945..a242d05f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeErrorTestCase.java @@ -58,6 +58,7 @@ public class IncludeErrorTestCase extends BaseTestCase implements TemplateTestBa return new TestSuite(IncludeErrorTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java index 91396a54..720ffc5c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IncludeEventHandlingTestCase.java @@ -92,6 +92,7 @@ public class IncludeEventHandlingTestCase extends BaseTestCase implements Includ super(name); } + @Override public void setUp() throws Exception { @@ -197,14 +198,16 @@ public class IncludeEventHandlingTestCase extends BaseTestCase implements Includ } - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { } /** * Sample handler with different behaviors for the different tests. */ - public String includeEvent( Context context, String includeResourcePath, String currentResourcePath, String directiveName) + @Override + public String includeEvent(Context context, String includeResourcePath, String currentResourcePath, String directiveName) { if (EventHandlerBehavior == PASS_THROUGH) return includeResourcePath; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java index aac83c78..a585de7e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IndexTestCase.java @@ -33,6 +33,7 @@ public class IndexTestCase extends BaseTestCase //DEBUG = true; } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java index 89bcbb8e..0ca5a150 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InfoTestCase.java @@ -58,6 +58,7 @@ public class InfoTestCase extends BaseTestCase implements TemplateTestBase return new TestSuite(InfoTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java index 455db88c..acaafba9 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InlineScopeVMTestCase.java @@ -46,6 +46,7 @@ public class InlineScopeVMTestCase extends BaseTestCase implements TemplateTestB super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java index 9c365241..bbd4bfab 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectionCacheDataTestCase.java @@ -43,6 +43,7 @@ public class IntrospectionCacheDataTestCase extends TestCase { public int cacheHit = 0; + @Override public IntrospectionCacheData icacheGet(Object key) { final IntrospectionCacheData result = super.icacheGet(key); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java index 788c4b54..ec2fec2b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/IntrospectorTestCase.java @@ -44,6 +44,7 @@ public class IntrospectorTestCase extends BaseTestCase private Introspector introspector; + @Override public void setUp() { mp = new MethodProvider(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java index d9db73b5..48ba8e61 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/InvalidEventHandlerTestCase.java @@ -99,7 +99,7 @@ extends TestCase { TestEventCartridge te = new TestEventCartridge(); - /** + /* * Test attaching the event cartridge to the context */ VelocityEngine ve = new VelocityEngine(); @@ -131,7 +131,6 @@ extends TestCase /** * Test assigning the event handlers via properties */ - public void testConfigurationEventHandlers() throws Exception { @@ -472,7 +471,8 @@ extends TestCase /** * Required by EventHandler */ - public void setRuntimeServices( RuntimeServices rs ) + @Override + public void setRuntimeServices(RuntimeServices rs ) { // make sure this is only called once if (this.rs == null) @@ -483,6 +483,7 @@ extends TestCase } + @Override public Object invalidGetMethod(Context context, String reference, Object object, String property, Info info) { // as a test, make sure this EventHandler is initialized @@ -493,7 +494,7 @@ extends TestCase { // good object, bad property case "$a1.foobar": - assertEquals(new Integer(5), object); + assertEquals(Integer.valueOf(5), object); assertEquals("foobar", property); throw new RuntimeException("expected exception"); @@ -548,6 +549,7 @@ extends TestCase return null; } + @Override public Object invalidMethod(Context context, String reference, Object object, String method, Info info) { // as a test, make sure this EventHandler is initialized @@ -576,6 +578,7 @@ extends TestCase } + @Override public boolean invalidSetMethod(Context context, String leftreference, String rightreference, Info info) { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java index 0a00d5d7..d8f12dde 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroAutoReloadTestCase.java @@ -43,6 +43,7 @@ public class MacroAutoReloadTestCase extends BaseTestCase super(name); } + @Override protected void setUp() throws Exception { // always copy macros library before modifying it, to ensure successive tests will pass diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java index 38822fdf..3a38f9e4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroCommentsTestCase.java @@ -31,6 +31,7 @@ public class MacroCommentsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java index 12a77eb0..368991f4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroDefaultArgTestCase.java @@ -31,6 +31,7 @@ public class MacroDefaultArgTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java index c7ac7f74..5a9fb8da 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MacroForwardDefineTestCase.java @@ -69,6 +69,7 @@ public class MacroForwardDefineTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java index 37b54e72..43436f0b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodCacheKeyTestCase.java @@ -20,7 +20,6 @@ package org.apache.velocity.test; */ import junit.framework.TestCase; -import org.apache.commons.io.filefilter.FalseFileFilter; import org.apache.commons.lang3.ArrayUtils; import org.apache.velocity.runtime.parser.node.ASTMethod; @@ -55,7 +54,7 @@ public class MethodCacheKeyTestCase extends TestCase assertFalse(mck1.equals(mck4)); - /** check for potential NPE's **/ + /* check for potential NPE's */ Class [] elements5 = ArrayUtils.EMPTY_CLASS_ARRAY; ASTMethod.MethodCacheKey mck5 = new ASTMethod.MethodCacheKey("boo",elements5, false); selfEqualsAssertions(mck5); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java index 4c1c7d59..34f4d813 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodInvocationExceptionTestCase.java @@ -48,6 +48,7 @@ public class MethodInvocationExceptionTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java index 98b5629e..711481c8 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MethodOverloadingTestCase.java @@ -84,6 +84,7 @@ public class MethodOverloadingTestCase extends BaseTestCase super(name); } + @Override public void setUp() { assureResultsDirectoryExists(RESULTS_DIR); @@ -97,7 +98,7 @@ public class MethodOverloadingTestCase extends BaseTestCase public void testMethodOverloading() throws Exception { - /** + /* * test overloading in a single template */ testFile("single"); @@ -108,7 +109,7 @@ public class MethodOverloadingTestCase extends BaseTestCase public void testParsedMethodOverloading() throws Exception { - /** + /* * test overloading in a file included with #parse */ testFile("main"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java index 0520e5ad..dc7d67aa 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultiLoaderTestCase.java @@ -79,6 +79,7 @@ public class MultiLoaderTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java index aeed8414..c3cd32f3 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/MultipleFileResourcePathTestCase.java @@ -76,6 +76,7 @@ public class MultipleFileResourcePathTestCase extends BaseTestCase return new TestSuite(MultipleFileResourcePathTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java index 25b6d55b..2a24d39a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/NumberMethodCallsTestCase.java @@ -53,6 +53,7 @@ public class NumberMethodCallsTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java index 4bbcbe2a..46c3b06d 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/OldPropertiesTestCase.java @@ -55,6 +55,7 @@ public class OldPropertiesTestCase extends TestCase implements TemplateTestBase super(name); } + @Override public void setUp() throws Exception { @@ -98,7 +99,7 @@ public class OldPropertiesTestCase extends TestCase implements TemplateTestBase // check getting old/new values List<String> oldPropSettings = FileUtils.readLines(new File(oldProperties)); - Set<String> oldKeys = new HashSet<String>(); + Set<String> oldKeys = new HashSet<>(); for (String oldProp : oldPropSettings) { Matcher matcher = propPattern.matcher(oldProp); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java index fd214e4b..5dd2bd24 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseExceptionTestCase.java @@ -53,6 +53,7 @@ public class ParseExceptionTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { Velocity.reset(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java index ba566e0e..1b83d5f4 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ParseWithMacroLibsTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test; import junit.framework.TestSuite; import org.apache.velocity.Template; @@ -45,6 +46,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -149,7 +151,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve.getTemplate("parseMacro1.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -241,7 +243,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve1.getTemplate("parseMacro2.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -291,7 +293,7 @@ public class ParseWithMacroLibsTestCase extends BaseTestCase Template template = ve1.getTemplate("parseMacro3.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java index c67b8dc3..13f2266a 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java @@ -32,6 +32,7 @@ public class PropertyMethodPrecedenceTestCase extends BaseTestCase // DEBUG = true; } + @Override protected void setUpContext(VelocityContext context) { context.put("geta", new getGetgetisTool()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java index 4cbf9d0d..74288393 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/RenderVelocityTemplateTest.java @@ -93,6 +93,7 @@ public class RenderVelocityTemplateTest { List<Throwable> errors = new ArrayList<>(); + @Override public void uncaughtException(Thread t, Throwable e) { errors.add(e); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java index 006bcd64..4ca9a5a6 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceCachingTestCase.java @@ -51,6 +51,7 @@ public class ResourceCachingTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java index 50460214..0c50219d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceExistsTestCase.java @@ -40,6 +40,7 @@ public class ResourceExistsTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { try { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java index 6ef03e62..e6217b0c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java @@ -84,6 +84,7 @@ public class ResourceLoaderInstanceTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java index d9c08ba9..21a6490d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/ScopeTestCase.java @@ -34,6 +34,7 @@ public class ScopeTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty("a.provide.scope.control", "true"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java index 130ed937..e6794800 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SetTestCase.java @@ -74,6 +74,7 @@ public class SetTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); @@ -87,12 +88,12 @@ public class SetTestCase extends BaseTestCase public void testSetNull() throws Exception { - /** + /* * Check that #set does accept nulls */ checkTemplate("set1"); - /** + /* * Check that #set can accept nulls, and has the correct behaviour for complex LHS */ checkTemplate("set2"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java index 69f88697..e8d22bdf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/SpaceGobblingTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test; import junit.framework.TestSuite; import org.apache.velocity.Template; @@ -46,6 +47,7 @@ public class SpaceGobblingTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -117,7 +119,7 @@ public class SpaceGobblingTestCase extends BaseTestCase Template template = ve.getTemplate(templateFile); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java index 7768fb25..f09a53d0 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StopDirectiveTestCase.java @@ -33,6 +33,7 @@ public class StopDirectiveTestCase extends BaseTestCase //DEBUG=true; } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java index d9c7a824..d5c7ff4e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictAlternateValuesTestCase.java @@ -45,6 +45,7 @@ public class StrictAlternateValuesTestCase extends BaseTestCase engine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, Boolean.TRUE); } + @Override protected void setUpContext(VelocityContext context) { context.put("foo", null); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java index 6c556286..5174f248 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictCompareTestCase.java @@ -33,6 +33,7 @@ public class StrictCompareTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java index 846e992e..b3ab04a6 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictEscapeTestCase.java @@ -31,6 +31,7 @@ public class StrictEscapeTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java index 333790a8..3632016b 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictForeachTestCase.java @@ -35,6 +35,7 @@ public class StrictForeachTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java index 2695ede0..4515a899 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictMathTestCase.java @@ -32,6 +32,7 @@ public class StrictMathTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java index 86abcb19..5a6b6d17 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StrictReferenceTestCase.java @@ -39,6 +39,7 @@ public class StrictReferenceTestCase extends BaseTestCase // second engine to test WITH conversions VelocityEngine engine2; + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java index c8d7c16b..f86e06c4 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringConcatenationTestCase.java @@ -30,6 +30,7 @@ public class StringConcatenationTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java index 5216527e..23aee4ce 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderRepositoryTestCase.java @@ -47,6 +47,7 @@ public class StringResourceLoaderRepositoryTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { Velocity.reset(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java index a5bcf37d..69c09bb5 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/StringResourceLoaderTestCase.java @@ -64,6 +64,7 @@ public class StringResourceLoaderTestCase extends BaseTestCase return new TestSuite(StringResourceLoaderTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java index bdf24cfc..99a4eacf 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/TemplateTestCase.java @@ -101,6 +101,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase /** * Sets up the test. */ + @Override protected void setUp () throws Exception { @@ -186,7 +187,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase // Add a TemplateNumber context.put ("templatenumber1", new TestNumber (999.125)); - /** + /* * Test #foreach() with a list containing nulls */ ArrayList nullList = new ArrayList(); @@ -203,6 +204,7 @@ public class TemplateTestCase extends BaseTestCase implements TemplateTestBase /** * Runs the test. */ + @Override public void runTest () throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java index 2c2abc3b..775a75b3 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java @@ -50,6 +50,7 @@ public class URLResourceLoaderTimeoutTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java index f0e495a0..4e243c3b 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/UberspectorTestCase.java @@ -47,6 +47,7 @@ public class UberspectorTestCase return new TestSuite(UberspectorTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java index 87ac8546..dde8cbd7 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VMLibraryTestCase.java @@ -61,6 +61,7 @@ public class VMLibraryTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -70,7 +71,7 @@ public class VMLibraryTestCase extends BaseTestCase ve1.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE); ve1.setProperty("velocimacro.permissions.allow.inline.to.replace.global", Boolean.FALSE); - /** + /* * Turn on the cache */ ve1.setProperty("file.resource.loader.cache", Boolean.TRUE); @@ -83,13 +84,13 @@ public class VMLibraryTestCase extends BaseTestCase TEST_COMPARE_DIR + "/macrolibs"); ve1.init(); - /** + /* * Set to global namespaces */ ve2.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.FALSE); ve2.setProperty("velocimacro.permissions.allow.inline.to.replace.global", Boolean.TRUE); - /** + /* * Turn on the cache */ ve2.setProperty("file.resource.loader.cache", Boolean.FALSE); @@ -108,14 +109,14 @@ public class VMLibraryTestCase extends BaseTestCase return new TestSuite(VMLibraryTestCase.class); } - /** + /* * Runs the tests with local namespace. */ public void testVelociMacroLibWithLocalNamespace() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -125,7 +126,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -140,7 +141,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library_local.vm"); template.merge(context, writer, templateList); - /** + /* * remove the first template library and includes a new library * with a new definition for macros */ @@ -157,13 +158,13 @@ public class VMLibraryTestCase extends BaseTestCase assertEquals("Both templates refer to the same object", t1, t2); - /** + /* * Remove the libraries */ template = ve1.getTemplate("vm_library_local.vm"); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -176,14 +177,14 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Runs the tests with global namespace. */ public void testVelociMacroLibWithGlobalNamespace() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -193,7 +194,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -208,7 +209,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library_global.vm"); template.merge(context, writer, templateList); - /** + /* * remove the first template library and includes a new library * with a new definition for macros */ @@ -225,7 +226,7 @@ public class VMLibraryTestCase extends BaseTestCase assertNotSame("Defferent objects", t1, t2); - /** + /* * Write to the file */ writer.flush(); @@ -238,14 +239,14 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Runs the tests with global namespace. */ public void testVelociMacroLibWithDuplicateDefinitions() throws Exception { assureResultsDirectoryExists(RESULT_DIR); - /** + /* * Clear the file before proceeding */ File file = new File(getFileName( @@ -255,7 +256,7 @@ public class VMLibraryTestCase extends BaseTestCase file.delete(); } - /** + /* * Create a file output stream for appending */ FileOutputStream fos = new FileOutputStream (getFileName( @@ -271,7 +272,7 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library.vm"); template.merge(context, writer, templateList); - /** + /* * Write to the file */ writer.flush(); @@ -284,7 +285,7 @@ public class VMLibraryTestCase extends BaseTestCase } } - /** + /* * Test whether the literal text is given if a definition cannot be * found for a macro. * @@ -304,13 +305,13 @@ public class VMLibraryTestCase extends BaseTestCase Template template = ve1.getTemplate("vm_library.vm"); template.merge(context, writer, null); - /** + /* * Write to the file */ writer.flush(); writer.close(); - /** + /* * outputs the macro calls */ if (!isMatch(RESULT_DIR, COMPARE_DIR, "vm_library", diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java index c1286b65..a87bba8e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VarargMethodsTestCase.java @@ -31,6 +31,7 @@ public class VarargMethodsTestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("nice", new NiceTool()); @@ -206,6 +207,7 @@ public class VarargMethodsTestCase extends BaseTestCase return "string"; } + @Override public String test(Object[] array) { return "object[]"; @@ -230,7 +232,7 @@ public class VarargMethodsTestCase extends BaseTestCase { o.append(", "); } - o.append(String.valueOf(array[i])); + o.append((array[i])); } o.append("]"); return o.toString(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java index 72a27c15..e41fe434 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroBCModeTestCase.java @@ -44,6 +44,7 @@ public class VelocimacroBCModeTestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { boolean bcMode = !getName().contains("NoPreserve"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java index 56dbe5e7..445cf44a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/VelocimacroTestCase.java @@ -48,6 +48,7 @@ public class VelocimacroTestCase extends TestCase super(name); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java index 0db5b426..1c8bd11f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/WrappedExceptionTestCase.java @@ -52,6 +52,7 @@ public class WrappedExceptionTestCase extends BaseTestCase implements TemplateTe return new TestSuite(WrappedExceptionTestCase.class); } + @Override public void setUp() throws Exception { ve = new VelocityEngine(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java index 02c5f94d..52220557 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler1.java @@ -39,6 +39,7 @@ public class Handler1 /** * display output twice, once uppercase and once lowercase */ + @Override public Object referenceInsert(Context context, String reference, Object value) { if (value == null) @@ -50,7 +51,8 @@ public class Handler1 /** * throw the exception */ - public Object methodException(Context context, Class claz, String method, Exception e, Info info) + @Override + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { throw new RuntimeException(e); } @@ -58,6 +60,7 @@ public class Handler1 /* * redirect all requests to a page "login.vm" (simulates access control). */ + @Override public String includeEvent( Context context, String includeResourcePath, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java index eeb1a173..033c9655 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java @@ -39,6 +39,7 @@ public class Handler2 /** * convert output to upper case */ + @Override public Object referenceInsert(Context context, String reference, Object value) { if (value == null) @@ -50,7 +51,8 @@ public class Handler2 /** * print the exception */ - public Object methodException(Context context, Class claz, String method, Exception e, Info info) + @Override + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { return "Exception: " + e; } @@ -58,6 +60,7 @@ public class Handler2 /* * redirect all requests to a new directory "subdir" (simulates localization). */ + @Override public String includeEvent( Context context, String includeResourcePath, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java index 04a926a6..3906f6c2 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java @@ -50,6 +50,7 @@ public class VelTools66TestCase return new TestSuite(VelTools66TestCase.class); } + @Override public void setUp() throws Exception { @@ -70,6 +71,7 @@ public class VelTools66TestCase } } + @Override public void tearDown() { System.setSecurityManager(null); @@ -114,11 +116,13 @@ public class VelTools66TestCase { } + @Override public String getTestValue() { return testValue; } + @Override public void setTestValue(final String testValue) { this.testValue = testValue; @@ -127,14 +131,14 @@ public class VelTools66TestCase public static final class TestSecurityManager extends SecurityManager { - private final Class clazz = TestObject.class; + private final Class<?> clazz = TestObject.class; public TestSecurityManager() { super(); } - public void checkMemberAccess(final Class c, final int i) + public void checkMemberAccess(final Class<?> c, final int i) { log("checkMemberAccess(" + c.getName() + ", " + i + ")"); @@ -144,21 +148,25 @@ public class VelTools66TestCase } } + @Override public void checkRead(final String file) { log("checkRead(" + file + ")"); } + @Override public void checkPackageAccess(final String s) { log("checkPackageAccess(" + s + ")"); } + @Override public void checkPropertyAccess(final String s) { log("checkPropertyAccess(" + s + ")"); } + @Override public void checkPermission(final Permission p) { log("checkPermission(" + p + ")"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java index 1371cf73..02ee5efb 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity537TestCase.java @@ -66,6 +66,7 @@ public class Velocity537TestCase extends BaseTestCase } private VelocityEngine velocityEngine; + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java index d393bee2..1018208c 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity544TestCase.java @@ -20,12 +20,11 @@ package org.apache.velocity.test.issues; */ import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.velocity.test.BaseTestCase; /** - * @see https://issues.apache.org/jira/browse/VELOCITY-544 + * @see <a href="https://issues.apache.org/jira/browse/VELOCITY-544">VELOCITY-544</a> */ public class Velocity544TestCase extends BaseTestCase diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java index 78667761..3918178a 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity579TestCase.java @@ -55,6 +55,7 @@ public class Velocity579TestCase extends BaseTestCase private static abstract class FooImpl implements Foo { + @Override public String foo(String s) { return s == null ? "foo" : s; @@ -71,6 +72,7 @@ public class Velocity579TestCase extends BaseTestCase public static class MyBar extends Foobar { + @Override public String bar() { return super.bar(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java index 3ae4a8b7..14904163 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity580TestCase.java @@ -65,6 +65,7 @@ public class Velocity580TestCase extends BaseTestCase return new TestSuite(Velocity580TestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java index b58b508b..fec7796d 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity615TestCase.java @@ -31,6 +31,7 @@ public class Velocity615TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java index 9c801762..e2974e26 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity616TestCase.java @@ -31,6 +31,7 @@ public class Velocity616TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java index cce590fd..faff4cad 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity627TestCase.java @@ -34,6 +34,7 @@ public class Velocity627TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java index 1861f7dc..e76a18bd 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity62TestCase.java @@ -31,6 +31,7 @@ public class Velocity62TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java index 3b8b8281..99289433 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity631TestCase.java @@ -31,6 +31,7 @@ public class Velocity631TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java index 0aba2c26..9e74fe24 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity644TestCase.java @@ -33,6 +33,7 @@ public class Velocity644TestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { super.setUp(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java index 3f6aeeab..7ff2ddf8 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity689TestCase.java @@ -33,6 +33,7 @@ public class Velocity689TestCase extends BaseTestCase //DEBUG = true; } + @Override public void setUpContext(VelocityContext ctx) { ctx.put("foo", new Foo()); @@ -61,11 +62,13 @@ public class Velocity689TestCase extends BaseTestCase private static class Foo implements NoMethod { + @Override public String getBar() { return "bar"; } + @Override public String getBaz() { return "baz"; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java index eb3dbde9..69bbf21e 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity701TestCase.java @@ -35,6 +35,7 @@ public class Velocity701TestCase extends BaseTestCase public void testAbstractClass() { context.put("foo", new Foo() { + @Override public String getBar() { return "bar"; } @@ -57,6 +58,7 @@ public class Velocity701TestCase extends BaseTestCase public enum Bar { ONE(){ + @Override public String getFoo() { return "foo"; } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java index f22497c1..ed74c6e3 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity702TestCase.java @@ -35,6 +35,7 @@ public class Velocity702TestCase extends BaseTestCase super(name); } + @Override public void setUpEngine(VelocityEngine engine) { engine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "high,low"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java index fe3034ec..45b7dfde 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity742TestCase.java @@ -33,6 +33,7 @@ public class Velocity742TestCase extends BaseTestCase super(name); } + @Override protected void setUpEngine(VelocityEngine engine) { // we need to call init here because otherwise it is not called until assertEvalEquals diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java index ca817562..5dba3633 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity747TestCase.java @@ -43,6 +43,7 @@ public class Velocity747TestCase extends BaseTestCase VelocityEngine engine1; VelocityEngine engine2; + @Override protected void setUp() throws Exception { Properties props = new Properties(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java index 12c48f6c..4c8d84c2 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity758TestCase.java @@ -53,6 +53,7 @@ public class Velocity758TestCase extends BaseTestCase public static class Handler implements IncludeEventHandler { + @Override public String includeEvent(Context context, String parsePath, String parentPath, String directive) { if (parsePath == null) diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java index 6dcf2f6e..5d2c94da 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity855TestCase.java @@ -33,6 +33,7 @@ public class Velocity855TestCase extends BaseTestCase super(name); } + @Override protected void setUpContext(VelocityContext context) { context.put("elementKind", javax.lang.model.element.ElementKind.class); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java index 2ed509e5..33397cfc 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity919TestCase.java @@ -1,21 +1,7 @@ package org.apache.velocity.test.issues; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.test.BaseTestCase; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.StringWriter; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.apache.velocity.test.TemplateTestBase.FILE_RESOURCE_LOADER_PATH; - public class Velocity919TestCase extends BaseTestCase { public Velocity919TestCase(String name) diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java index af1a9c62..5c1ee041 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity924TestCase.java @@ -37,6 +37,7 @@ public class Velocity924TestCase extends BaseTestCase public String getName() { return "foo"; } } + @Override protected void setUpContext(VelocityContext context) { context.put("var", new Foo()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java index 1a335507..41a33213 100755 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/Velocity926TestCase.java @@ -19,7 +19,6 @@ package org.apache.velocity.test.issues; * under the License. */ -import org.apache.velocity.VelocityContext; import org.apache.velocity.test.BaseTestCase; /** diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java index 5d68d244..0717310a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingDirective.java @@ -38,16 +38,19 @@ import java.io.Writer; */ public class ExceptionGeneratingDirective extends Directive { + @Override public String getName() { return "Exception"; } + @Override public int getType() { return Directive.BLOCK; } + @Override public boolean render(InternalContextAdapter context, Writer writer, Node node) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java index 9353d85f..037594ac 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java @@ -36,14 +36,17 @@ public class ExceptionGeneratingEventHandler implements IncludeEventHandler, MethodExceptionEventHandler, ReferenceInsertionEventHandler { + @Override public String includeEvent(Context context, String includeResourcePath, String currentResourcePath, - String directiveName) + String directiveName) { throw new RuntimeException("exception"); } - public Object methodException(Context context, Class claz, String method, Exception e, Info info) { throw new RuntimeException("exception"); } + @Override + public Object methodException(Context context, Class<?> claz, String method, Exception e, Info info) { throw new RuntimeException("exception"); } + @Override public Object referenceInsert(Context context, String reference, Object value) { throw new RuntimeException("exception"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java index b5d0e975..fef7adb3 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingResourceLoader.java @@ -36,20 +36,24 @@ import java.io.Reader; public class ExceptionGeneratingResourceLoader extends ResourceLoader { + @Override public void init(ExtProperties configuration) { } + @Override public Reader getResourceReader(String source, String encoding) throws ResourceNotFoundException { throw new RuntimeException("exception"); } + @Override public boolean isSourceModified(Resource resource) { return false; } + @Override public long getLastModified(Resource resource) { return 0; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java index 03c50224..4b8e3bda 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestContext.java @@ -38,21 +38,25 @@ public class TestContext implements Context Context innerContext = new VelocityContext(); Map<String, String> originalKeys = new HashMap<>(); + @Override public boolean containsKey(String key) { return innerContext.containsKey(normalizeKey(key)); } + @Override public Object get(String key) { return innerContext.get(normalizeKey(key)); } + @Override public String[] getKeys() { return originalKeys.values().toArray(new String[originalKeys.size()]); } + @Override public Object put(String key, Object value) { String normalizedKey = normalizeKey(key); @@ -60,6 +64,7 @@ public class TestContext implements Context return innerContext.put(normalizedKey, value); } + @Override public Object remove(String key) { originalKeys.remove(key); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java index 5cba573c..e7a4e990 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogger.java @@ -163,166 +163,196 @@ public class TestLogger extends MarkerIgnoringBase * Logging API */ + @Override public boolean isTraceEnabled() { return isLevelEnabled(LOG_LEVEL_TRACE); } + @Override public void trace(String msg) { log(LOG_LEVEL_TRACE, msg, null); } + @Override public void trace(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_TRACE, ft.getMessage(), ft.getThrowable()); } + @Override public void trace(String msg, Throwable t) { log(LOG_LEVEL_TRACE, msg, t); } + @Override public boolean isDebugEnabled() { return isLevelEnabled(LOG_LEVEL_DEBUG); } + @Override public void debug(String msg) { log(LOG_LEVEL_DEBUG, msg, null); } + @Override public void debug(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_DEBUG, ft.getMessage(), ft.getThrowable()); } + @Override public void debug(String msg, Throwable t) { log(LOG_LEVEL_DEBUG, msg, t); } + @Override public boolean isInfoEnabled() { return isLevelEnabled(LOG_LEVEL_INFO); } + @Override public void info(String msg) { log(LOG_LEVEL_INFO, msg, null); } + @Override public void info(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_INFO, ft.getMessage(), ft.getThrowable()); } + @Override public void info(String msg, Throwable t) { log(LOG_LEVEL_INFO, msg, t); } + @Override public boolean isWarnEnabled() { return isLevelEnabled(LOG_LEVEL_WARN); } + @Override public void warn(String msg) { log(LOG_LEVEL_WARN, msg, null); } + @Override public void warn(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_WARN, ft.getMessage(), ft.getThrowable()); } + @Override public void warn(String msg, Throwable t) { log(LOG_LEVEL_WARN, msg, t); } + @Override public boolean isErrorEnabled() { return isLevelEnabled(LOG_LEVEL_ERROR); } + @Override public void error(String msg) { log(LOG_LEVEL_ERROR, msg, null); } + @Override public void error(String format, Object arg) { FormattingTuple ft = MessageFormatter.format(format, arg); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String format, Object arg1, Object arg2) { FormattingTuple ft = MessageFormatter.format(format, arg1, arg2); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String format, Object[] argArray) { FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); log(LOG_LEVEL_ERROR, ft.getMessage(), ft.getThrowable()); } + @Override public void error(String msg, Throwable t) { log(LOG_LEVEL_ERROR, msg, t); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java index f41fc6d7..71a96a4a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestException.java @@ -53,6 +53,7 @@ public class UberspectTestException extends RuntimeException return info; } + @Override public String getMessage() { return super.getMessage() + "\n failed at " + info; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java index 0bdb6baa..b07f6725 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/UberspectTestImpl.java @@ -31,6 +31,7 @@ import org.apache.velocity.util.introspection.VelPropertyGet; public class UberspectTestImpl extends UberspectImpl { + @Override public VelMethod getMethod(Object obj, String methodName, Object[] args, Info i) { VelMethod method = super.getMethod(obj, methodName, args, i); @@ -46,6 +47,7 @@ public class UberspectTestImpl extends UberspectImpl return method; } + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info i) { VelPropertyGet propertyGet = super.getPropertyGet(obj, identifier, i); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java index d6b30e3a..6515c752 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/Child.java @@ -29,6 +29,7 @@ package org.apache.velocity.test.provider; */ public class Child extends Person { + @Override public String getName() { return "Child"; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java index 35491918..5850eec5 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestNumber.java @@ -37,6 +37,7 @@ public class TestNumber implements TemplateNumber n = val; } + @Override public Number getAsNumber() { return n; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java index 44ed270b..60eea81f 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/provider/TestProvider.java @@ -125,9 +125,9 @@ public class TestProvider for (int i = 0; i < 3; i++) { Hashtable item = new Hashtable(); - item.put("id", "item" + Integer.toString(i+1)); - item.put("name", "name" + Integer.toString(i+1)); - item.put("label", "label" + Integer.toString(i+1)); + item.put("id", "item" + (i+1)); + item.put("name", "name" + (i+1)); + item.put("label", "label" + (i+1)); //al.add(item); menu[i] = item; } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java index ac57df45..4acef0f8 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DBHelper.java @@ -26,7 +26,6 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.SQLException; import java.sql.Statement; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java index 3f63a6bc..757b6e84 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java @@ -83,6 +83,7 @@ public class DataSourceResourceLoaderTestCase return new TestSuite(DataSourceResourceLoaderTestCase.class); } + @Override public void setUp() throws Exception { diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java index da825f48..286cfc2a 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/sql/TestDataSource.java @@ -46,48 +46,57 @@ public class TestDataSource implements DataSource Class.forName(driverClass); } + @Override public Connection getConnection() throws SQLException { return DriverManager.getConnection(url, user, password); } + @Override public Connection getConnection(final String username, final String password) throws SQLException { return DriverManager.getConnection(url, username, password); } + @Override public PrintWriter getLogWriter() throws SQLException { return logWriter; } + @Override public int getLoginTimeout() throws SQLException { return loginTimeout; } + @Override public void setLogWriter(final PrintWriter logWriter) throws SQLException { this.logWriter = logWriter; } + @Override public void setLoginTimeout(final int loginTimeout) throws SQLException { this.loginTimeout = loginTimeout; } + @Override public boolean isWrapperFor(final Class iface) throws SQLException { return false; } + @Override public Object unwrap(final Class iface) throws SQLException { throw new SQLException("Not implemented"); } /* added to be able to compile with jdk 1.7+ */ + @Override public Logger getParentLogger() throws SQLFeatureNotSupportedException { throw new SQLFeatureNotSupportedException(); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java index 1c81776b..2687d662 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java @@ -49,6 +49,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { return new TestSuite(ChainedUberspectorsTestCase.class); } + @Override public void setUp() throws Exception { @@ -60,6 +61,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { Velocity.init(); } + @Override public void tearDown() { } @@ -88,6 +90,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { // replaces getFoo by getBar public static class ChainedUberspector extends AbstractChainableUberspector { + @Override public VelPropertySet getPropertySet(Object obj, String identifier, Object arg, Info info) { identifier = identifier.replaceAll("foo","bar"); @@ -98,6 +101,7 @@ public class ChainedUberspectorsTestCase extends BaseTestCase { // replaces setFoo by setBar public static class LinkedUberspector extends UberspectImpl { + @Override public VelPropertyGet getPropertyGet(Object obj, String identifier, Info info) { identifier = identifier.replaceAll("foo","bar"); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java index ddaa9456..be0a1e31 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ClassMapTestCase.java @@ -44,6 +44,7 @@ public class ClassMapTestCase return new TestSuite(ClassMapTestCase.class); } + @Override public void setUp() throws Exception { @@ -51,6 +52,7 @@ public class ClassMapTestCase Velocity.init(); } + @Override public void tearDown() { } diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java index 66a1c8c4..a006a547 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/ConversionHandlerTestCase.java @@ -1,4 +1,6 @@ -/** +package org.apache.velocity.test.util.introspection; + +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.velocity.test.util.introspection; import junit.framework.TestSuite; import org.apache.commons.lang3.StringUtils; @@ -67,6 +68,7 @@ public class ConversionHandlerTestCase extends BaseTestCase super(name); } + @Override public void setUp() throws Exception { @@ -175,19 +177,19 @@ public class ConversionHandlerTestCase extends BaseTestCase }; @Override - public boolean isExplicitlyConvertible(Type formal, Class actual, boolean possibleVarArg) + public boolean isExplicitlyConvertible(Type formal, Class<?> actual, boolean possibleVarArg) { return true; } @Override - public Converter getNeededConverter(Type formal, Class actual) + public Converter<?> getNeededConverter(Type formal, Class<?> actual) { return myCustomConverter; } @Override - public void addConverter(Type formal, Class actual, Converter converter) + public void addConverter(Type formal, Class<?> actual, Converter<?> converter) { throw new RuntimeException("not implemented"); } @@ -239,7 +241,7 @@ public class ConversionHandlerTestCase extends BaseTestCase Template template = ve.getTemplate(templateFile); template.merge(context, writer); - /** + /* * Write to the file */ writer.flush(); @@ -296,6 +298,7 @@ public class ConversionHandlerTestCase extends BaseTestCase public static class PrintException implements MethodExceptionEventHandler { + @Override public Object methodException(Context context, Class claz, String method, diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java index 1e90f811..6b5b8857 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/DeprecatedCheckUberspectorsTestCase.java @@ -46,6 +46,7 @@ public class DeprecatedCheckUberspectorsTestCase extends BaseTestCase { return new TestSuite(DeprecatedCheckUberspectorsTestCase.class); } + @Override protected void setUpEngine(VelocityEngine engine) { engine.setProperty(Velocity.RUNTIME_LOG_INSTANCE, new TestLogger(false, true)); @@ -53,6 +54,7 @@ public class DeprecatedCheckUberspectorsTestCase extends BaseTestCase { engine.addProperty(Velocity.UBERSPECT_CLASSNAME, "org.apache.velocity.util.introspection.DeprecatedCheckUberspector"); } + @Override protected void setUpContext(VelocityContext context) { context.put("obj1", new StandardObject()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java index 97ae07d3..3fbddf22 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/EnumConstantConversionTestCase.java @@ -56,6 +56,7 @@ public class EnumConstantConversionTestCase extends BaseTestCase { } } + @Override protected void setUpContext(VelocityContext context) { context.put("obj", new Obj()); diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java index 1c706b4f..c074be5e 100644 --- a/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java +++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/util/introspection/UberspectImplTestCase.java @@ -3,13 +3,11 @@ package org.apache.velocity.test.util.introspection; import junit.framework.Test; import junit.framework.TestSuite; import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; 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; @@ -105,6 +103,7 @@ public class UberspectImplTestCase extends BaseTestCase public class SomeIterable implements Iterable { + @Override public Iterator iterator() { return Arrays.asList("1", "2", "3").iterator(); |