Author: nbubna
Date: Wed Feb 4 23:54:43 2009
New Revision: 740939
URL: http://svn.apache.org/viewvc?rev=740939&view=rev
Log:
move to a single base class for tests and add various improvements thereto
Removed:
velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java
Modified:
velocity/engine/trunk/build/build.xml
velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/BlockMacroTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/DefineTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachBreakTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/IfNullTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StopDirectiveTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictCompareTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictForeachTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/UnicodeEscapeTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity532TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity544TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity579TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity587TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity589TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity614TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity616TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity630TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity644TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
Modified: velocity/engine/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.xml?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
--- velocity/engine/trunk/build/build.xml (original)
+++ velocity/engine/trunk/build/build.xml Wed Feb 4 23:54:43 2009
@@ -1199,6 +1199,7 @@
<formatter type="plain"/>
<test name="${testcase}" if="testcase" todir="${build.test.reports}"/>
+ <sysproperty key="testcase" value="${testcase}"/>
<batchtest todir="${build.test.reports}" unless="testcase">
<fileset dir="${build.test.src}">
<include name="**/*TestCase.java"></include>
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
Wed Feb 4 23:54:43 2009
@@ -29,10 +29,8 @@
* and that they produce the same results as the same methods would on
* a fixed-size {...@link List}.
*/
-public class ArrayMethodsTestCase extends BaseEvalTestCase
+public class ArrayMethodsTestCase extends BaseTestCase
{
- private final static boolean PRINT_RESULTS = false;
-
public ArrayMethodsTestCase(final String name)
{
super(name);
@@ -105,11 +103,8 @@
context.remove("setme");
}
- if (PRINT_RESULTS)
- {
- System.out.println("Changing to an array of: " +
array.getClass().getComponentType());
- System.out.println("Changing setme to: " + setme);
- }
+ info("Changing to an array of: " +
array.getClass().getComponentType());
+ info("Changing setme to: " + setme);
int size = Array.getLength(array);
checkResult("size()", String.valueOf(size), compareToList);
@@ -180,13 +175,10 @@
assertEquals(result, listResult);
}
- if (PRINT_RESULTS)
+ info(" <$!array."+method+"> resolved to <"+result+">");
+ if (compareToList)
{
- System.out.println(" <$!array."+method+"> resolved to
<"+result+">");
- if (compareToList)
- {
- System.out.println(" <$!list."+method+"> resolved to
"+listResult+">");
- }
+ info(" <$!list."+method+"> resolved to "+listResult+">");
}
}
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
(original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/BaseTestCase.java
Wed Feb 4 23:54:43 2009
@@ -21,35 +21,272 @@
import java.io.File;
import java.io.IOException;
-
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import junit.framework.TestCase;
-
import org.apache.oro.text.perl.Perl5Util;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.util.StringUtils;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.test.misc.TestLogChute;
/**
- * Base test case that provides a few utility methods for
+ * Base test case that provides utility methods for
* the rest of the tests.
*
* @author <a href="mailto:[email protected]";>Daniel Rall</a>
+ * @author Nathan Bubna
* @version $Id$
*/
-public abstract class BaseTestCase
- extends TestCase
- implements TemplateTestBase
+public abstract class BaseTestCase extends TestCase implements TemplateTestBase
{
+ protected VelocityEngine engine;
+ protected VelocityContext context;
+ protected boolean DEBUG = false;
+ protected TestLogChute log;
+
+ public BaseTestCase(String name)
+ {
+ super(name);
+
+ // if we're just running one case, then have DEBUG
+ // automatically set to true
+ String testcase = System.getProperty("testcase");
+ if (testcase != null)
+ {
+ DEBUG = testcase.equals(getClass().getName());
+ }
+ }
+
+ protected void setUp() throws Exception
+ {
+ engine = new VelocityEngine();
+
+ //by default, make the engine's log output go to the test-report
+ log = new TestLogChute(false, false);
+ log.setEnabledLevel(TestLogChute.INFO_ID);
+ log.setSystemErrLevel(TestLogChute.WARN_ID);
+ engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, log);
+ setUpEngine(engine);
+
+ context = new VelocityContext();
+ setUpContext(context);
+ }
+
+ protected void setUpEngine(VelocityEngine engine)
+ {
+ // extension hook
+ }
+
+ protected void setUpContext(VelocityContext context)
+ {
+ // extension hook
+ }
+
+ public void tearDown()
+ {
+ engine = null;
+ context = null;
+ }
+
+ protected void info(String msg)
+ {
+ if (DEBUG)
+ {
+ if (engine == null)
+ {
+ Velocity.getLog().info(msg);
+ }
+ else
+ {
+ engine.getLog().info(msg);
+ }
+ }
+ }
+
+ protected void info(String msg, Throwable t)
+ {
+ if (DEBUG)
+ {
+ if (engine == null)
+ {
+ Velocity.getLog().info(msg);
+ }
+ else
+ {
+ engine.getLog().info(msg, t);
+ }
+ }
+ }
+
+ public void testBase()
+ {
+ if (DEBUG)
+ {
+ assertSchmoo("");
+ assertSchmoo("abc\n123");
+ }
+ }
+
+ /**
+ * Compare an expected string with the given loaded template
+ */
+ protected void assertTmplEquals(String expected, String template)
+ {
+ info("Expected: '" + expected + "'");
+
+ StringWriter writer = new StringWriter();
+ try
+ {
+ engine.mergeTemplate(template, "utf-8", context, writer);
+ }
+ catch (RuntimeException re)
+ {
+ info("RuntimeException!", re);
+ throw re;
+ }
+ catch (Exception e)
+ {
+ info("Exception!", e);
+ throw new RuntimeException(e);
+ }
+
+ info("Result: '" + writer.toString() + "'");
+ assertEquals(expected, writer.toString());
+ }
+
/**
- * used for nomalization of output and compare data
+ * Ensure that a context value is as expected.
*/
- private Perl5Util perl = new Perl5Util();
+ protected void assertContextValue(String key, Object expected)
+ {
+ info("Expected value of '"+key+"': "+expected);
+ Object value = context.get(key);
+ info("Result: "+value);
+ assertEquals(expected, value);
+ }
/**
- * Default constructor.
+ * Ensure that a template renders as expected.
*/
- public BaseTestCase(String name)
+ protected void assertEvalEquals(String expected, String template)
{
- super(name);
+ info("Expectation: "+expected);
+ assertEquals(expected, evaluate(template));
+ }
+
+ /**
+ * Ensure that the given string renders as itself when evaluated.
+ */
+ protected void assertSchmoo(String templateIsExpected)
+ {
+ assertEvalEquals(templateIsExpected, templateIsExpected);
+ }
+
+ /**
+ * Ensure that an exception occurs when the string is evaluated.
+ */
+ protected Exception assertEvalException(String evil)
+ {
+ return assertEvalException(evil, null);
+ }
+
+ /**
+ * Ensure that a specified type of exception occurs when evaluating the
string.
+ */
+ protected Exception assertEvalException(String evil, Class exceptionType)
+ {
+ try
+ {
+ if (!DEBUG)
+ {
+ log.off();
+ }
+ if (exceptionType != null)
+ {
+ info("Expectation: "+exceptionType.getName());
+ }
+ evaluate(evil);
+ fail("Template '"+evil+"' should have thrown an exception.");
+ }
+ catch (Exception e)
+ {
+ if (exceptionType != null &&
!exceptionType.isAssignableFrom(e.getClass()))
+ {
+ fail("Was expecting template '"+evil+"' to throw
"+exceptionType+" not "+e);
+ }
+ return e;
+ }
+ finally
+ {
+ if (!DEBUG)
+ {
+ log.on();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Ensure that the error message of the expected exception has the proper
location info.
+ */
+ protected Exception assertEvalExceptionAt(String evil, String template,
+ int line, int col)
+ {
+ String loc = template+"[line "+line+", column "+col+"]";
+ info("Expectation: Exception at "+loc);
+ Exception e = assertEvalException(evil);
+
+ info("Result: "+e.getClass().getName()+" - "+e.getMessage());
+ if (e.getMessage().indexOf(loc) < 1)
+ {
+ fail("Was expecting exception at "+loc+" instead of
"+e.getMessage());
+ }
+ return e;
+ }
+
+ /**
+ * Only ensure that the error message of the expected exception
+ * has the proper line and column info.
+ */
+ protected Exception assertEvalExceptionAt(String evil, int line, int col)
+ {
+ return assertEvalExceptionAt(evil, "", line, col);
+ }
+
+ /**
+ * Evaluate the specified String as a template and return the result as a
String.
+ */
+ protected String evaluate(String template)
+ {
+ StringWriter writer = new StringWriter();
+ try
+ {
+ info("Template: "+template);
+
+ // use template as its own name, since our templates are short
+ // unless it's not that short, then shorten it...
+ String name = (template.length() <= 15) ? template :
template.substring(0,15);
+ engine.evaluate(context, writer, name, template);
+
+ String result = writer.toString();
+ info("Result: "+result);
+ return result;
+ }
+ catch (RuntimeException re)
+ {
+ info("RuntimeException!", re);
+ throw re;
+ }
+ catch (Exception e)
+ {
+ info("Exception!", e);
+ throw new RuntimeException(e);
+ }
}
/**
@@ -57,19 +294,17 @@
*
* @return The full path to the file.
*/
- protected static String getFileName (final String dir, final String base,
final String ext)
+ protected String getFileName(final String dir, final String base, final
String ext)
{
return getFileName(dir, base, ext, false);
}
- protected static String getFileName (final String dir, final String base,
final String ext, final boolean mustExist)
+ protected String getFileName(final String dir, final String base, final
String ext, final boolean mustExist)
{
StringBuffer buf = new StringBuffer();
-
try
{
File baseFile = new File(base);
-
if (dir != null)
{
if (!baseFile.isAbsolute())
@@ -95,12 +330,16 @@
if (!testFile.exists())
{
- fail("getFileName() result " + testFile.getPath() + " does
not exist!");
+ String msg = "getFileName() result " + testFile.getPath()
+ " does not exist!";
+ info(msg);
+ fail(msg);
}
if (!testFile.isFile())
{
- fail("getFileName() result " + testFile.getPath() + " is
not a file!");
+ String msg = "getFileName() result " + testFile.getPath()
+ " is not a file!";
+ info(msg);
+ fail(msg);
}
}
}
@@ -116,31 +355,32 @@
* Assures that the results directory exists. If the results directory
* cannot be created, fails the test.
*/
- protected static void assureResultsDirectoryExists (String
resultsDirectory)
+ protected void assureResultsDirectoryExists(String resultsDirectory)
{
File dir = new File(resultsDirectory);
if (!dir.exists())
{
- String msg = "Template results directory
("+resultsDirectory+")does not exist";
- RuntimeSingleton.getLog().info(msg);
+ info("Template results directory ("+resultsDirectory+") does not
exist");
if (dir.mkdirs())
{
- RuntimeSingleton.getLog().info("Created template results
directory");
-//caveman hack to get gump to give more info
-System.out.println("Created template results directory: "+resultsDirectory);
+ info("Created template results directory");
+ if (DEBUG)
+ {
+ info("Created template results directory:
"+resultsDirectory);
+ }
}
else
{
- String errMsg = "Unable to create template results directory";
- RuntimeSingleton.getLog().warn(errMsg);
-//caveman hack to get gump to give more info
-System.out.println(errMsg);
+ String errMsg = "Unable to create '"+resultsDirectory+"'";
+ info(errMsg);
fail(errMsg);
}
}
}
+ //TODO: drop this for JDK regex once we move to JDK 1.5
+ private static Perl5Util perl = new Perl5Util();
/**
* Normalizes lines to account for platform differences. Macs use
* a single \r, DOS derived operating systems use \r\n, and Unix
@@ -167,20 +407,17 @@
String compareDir,
String baseFileName,
String resultExt,
- String compareExt)
- throws Exception
+ String compareExt) throws Exception
{
- String result = StringUtils.fileContentsToString
- (getFileName(resultsDir, baseFileName, resultExt, true));
-
+ String result = getFileContents(resultsDir, baseFileName, resultExt);
return isMatch(result,compareDir,baseFileName,compareExt);
}
protected String getFileContents(String dir, String baseFileName, String
ext)
{
- return StringUtils
- .fileContentsToString(getFileName(dir, baseFileName, ext, true));
+ String fileName = getFileName(dir, baseFileName, ext, true);
+ return StringUtils.fileContentsToString(fileName);
}
/**
@@ -192,31 +429,31 @@
*
* @exception Exception Test failure condition.
*/
- protected boolean isMatch (
- String result,
+ protected boolean isMatch (String result,
String compareDir,
String baseFileName,
- String compareExt)
- throws Exception
+ String compareExt) throws Exception
{
- String compare = StringUtils.fileContentsToString
- (getFileName(compareDir, baseFileName, compareExt, true));
+ String compare = getFileContents(compareDir, baseFileName, compareExt);
- /*
- * normalize each wrt newline
- */
-
- return normalizeNewlines(result).equals(
- normalizeNewlines( compare ) );
+ // normalize each wrt newline
+ result = normalizeNewlines(result);
+ compare = normalizeNewlines(compare);
+ if (DEBUG)
+ {
+ info("Expection: "+compare);
+ info("Result: "+result);
+ }
+ return result.equals(compare);
}
- /**
+ /**
* Turns a base file name into a test case name.
*
* @param s The base file name.
* @return The test case name.
*/
- protected static final String getTestCaseName (String s)
+ protected static final String getTestCaseName(String s)
{
StringBuffer name = new StringBuffer();
name.append(Character.toTitleCase(s.charAt(0)));
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/BlockMacroTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/BlockMacroTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/BlockMacroTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/BlockMacroTestCase.java
Wed Feb 4 23:54:43 2009
@@ -24,7 +24,7 @@
/**
* This class tests the BlockMacro functionality.
*/
-public class BlockMacroTestCase extends BaseEvalTestCase
+public class BlockMacroTestCase extends BaseTestCase
{
public BlockMacroTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/DefineTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/DefineTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/DefineTestCase.java
(original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/DefineTestCase.java
Wed Feb 4 23:54:43 2009
@@ -24,7 +24,7 @@
/**
* This class tests the #define directive
*/
-public class DefineTestCase extends BaseEvalTestCase
+public class DefineTestCase extends BaseTestCase
{
public DefineTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachBreakTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachBreakTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachBreakTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachBreakTestCase.java
Wed Feb 4 23:54:43 2009
@@ -22,7 +22,7 @@
/**
* This class tests the break directive within Foreach loop.
*/
-public class ForeachBreakTestCase extends BaseEvalTestCase
+public class ForeachBreakTestCase extends BaseTestCase
{
public ForeachBreakTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
Wed Feb 4 23:54:43 2009
@@ -38,7 +38,7 @@
* @author Daniel Rall
* @author <a href="mailto:[email protected]";>Will Glass-Husain</a>
*/
-public class ForeachTestCase extends BaseEvalTestCase
+public class ForeachTestCase extends BaseTestCase
{
public ForeachTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/IfNullTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/IfNullTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/IfNullTestCase.java
(original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/IfNullTestCase.java
Wed Feb 4 23:54:43 2009
@@ -24,14 +24,14 @@
/**
* Used to check that nulls are properly handled in #if statements
*/
-public class IfNullTestCase extends BaseEvalTestCase
+public class IfNullTestCase extends BaseTestCase
{
public IfNullTestCase(final String name)
{
super(name);
}
- protected void setContext(VelocityContext context)
+ protected void setUpContext(VelocityContext context)
{
context.put("nullToString", new NullToString());
context.put("notnull", new Object());
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java
(original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/IndexTestCase.java
Wed Feb 4 23:54:43 2009
@@ -24,7 +24,7 @@
/**
* Test index syntax e.g, $foo[1]
*/
-public class IndexTestCase extends BaseEvalTestCase
+public class IndexTestCase extends BaseTestCase
{
public IndexTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
Wed Feb 4 23:54:43 2009
@@ -86,6 +86,7 @@
Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,logger);
Velocity.setProperty(TestLogChute.TEST_LOGGER_LEVEL, "debug");
Velocity.init();
+ // DEBUG = true;
}
public static Test suite()
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/PropertyMethodPrecedenceTestCase.java
Wed Feb 4 23:54:43 2009
@@ -24,14 +24,15 @@
/**
* Used to check that vararg method calls on references work properly
*/
-public class PropertyMethodPrecedenceTestCase extends BaseEvalTestCase
+public class PropertyMethodPrecedenceTestCase extends BaseTestCase
{
public PropertyMethodPrecedenceTestCase(final String name)
{
super(name);
+ // DEBUG = true;
}
- protected void setContext(VelocityContext context)
+ protected void setUpContext(VelocityContext context)
{
context.put("geta", new getGetgetisTool());
context.put("getA", new GetgetisTool());
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
Wed Feb 4 23:54:43 2009
@@ -26,7 +26,7 @@
* like java.lang.Math directly into the context in order to
* use their methods.
*/
-public class StaticUtilityMethodsTestCase extends BaseEvalTestCase
+public class StaticUtilityMethodsTestCase extends BaseTestCase
{
public StaticUtilityMethodsTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StopDirectiveTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StopDirectiveTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StopDirectiveTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StopDirectiveTestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* Test the #stop directive
*/
-public class StopDirectiveTestCase extends BaseEvalTestCase
+public class StopDirectiveTestCase extends BaseTestCase
{
public StopDirectiveTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictCompareTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictCompareTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictCompareTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictCompareTestCase.java
Wed Feb 4 23:54:43 2009
@@ -28,7 +28,7 @@
* Make sure exceptions are thrown for strict comparisons that
* cannot be compared.
*/
-public class StrictCompareTestCase extends BaseEvalTestCase
+public class StrictCompareTestCase extends BaseTestCase
{
public StrictCompareTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictEscapeTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictEscapeTestCase.java
Wed Feb 4 23:54:43 2009
@@ -26,7 +26,7 @@
* Test Strict escape mode
* property: RuntimeConstants.RUNTIME_REFERENCES_STRICT_ESCAPE set to true
*/
-public class StrictEscapeTestCase extends BaseEvalTestCase
+public class StrictEscapeTestCase extends BaseTestCase
{
public StrictEscapeTestCase(String name)
{
@@ -40,7 +40,7 @@
context.put("pow", "bang");
context.put("NULL", null);
context.put("animal", new Animal());
- DEBUG = true;
+ // DEBUG = true;
}
public void testReferenceEscape()
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictForeachTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictForeachTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictForeachTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictForeachTestCase.java
Wed Feb 4 23:54:43 2009
@@ -28,7 +28,7 @@
/**
* This class tests support for strict foreach mode.
*/
-public class StrictForeachTestCase extends BaseEvalTestCase
+public class StrictForeachTestCase extends BaseTestCase
{
public StrictForeachTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
Wed Feb 4 23:54:43 2009
@@ -26,7 +26,7 @@
/**
* This class tests support for strict math mode.
*/
-public class StrictMathTestCase extends BaseEvalTestCase
+public class StrictMathTestCase extends BaseTestCase
{
public StrictMathTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
Wed Feb 4 23:54:43 2009
@@ -28,7 +28,7 @@
* Test strict reference mode turned on by the velocity property
* runtime.references.strict
*/
-public class StrictReferenceTestCase extends BaseEvalTestCase
+public class StrictReferenceTestCase extends BaseTestCase
{
public StrictReferenceTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/StringConcatenationTestCase.java
Wed Feb 4 23:54:43 2009
@@ -26,7 +26,7 @@
/**
* This class tests support for string concatenation.
*/
-public class StringConcatenationTestCase extends BaseEvalTestCase
+public class StringConcatenationTestCase extends BaseTestCase
{
public StringConcatenationTestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/TextblockTestCase.java
Wed Feb 4 23:54:43 2009
@@ -25,7 +25,7 @@
/**
* This class tests the Textblock directive.
*/
-public class TextblockTestCase extends BaseEvalTestCase
+public class TextblockTestCase extends BaseTestCase
{
// these are all here so that the test case adapts instantly
// to changes in the textblock start/end sequences
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/URLResourceLoaderTimeoutTestCase.java
Wed Feb 4 23:54:43 2009
@@ -26,7 +26,7 @@
/**
* This class tests support for custom timeouts in URLResourceLoader.
*/
-public class URLResourceLoaderTimeoutTestCase extends BaseEvalTestCase
+public class URLResourceLoaderTimeoutTestCase extends BaseTestCase
{
private static boolean isJava5plus;
static
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/UnicodeEscapeTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/UnicodeEscapeTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/UnicodeEscapeTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/UnicodeEscapeTestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,11 +19,6 @@
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import java.io.StringWriter;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.VelocityContext;
import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
@@ -32,41 +27,14 @@
*/
public class UnicodeEscapeTestCase extends BaseTestCase
{
- private VelocityEngine engine;
- private VelocityContext context;
-
public UnicodeEscapeTestCase(final String name) throws Exception
{
super(name);
}
- public static Test suite()
- {
- return new TestSuite(UnicodeEscapeTestCase.class);
- }
-
- public void setUp() throws Exception
- {
- engine = new VelocityEngine();
- context = new VelocityContext();
- }
-
- public void tearDown()
- {
- engine = null;
- context = null;
- }
-
- private String evaluate(String template) throws Exception
- {
- StringWriter writer = new StringWriter();
- engine.evaluate(context, writer, "test", template);
- return writer.toString();
- }
-
public void testUnicodeEscape() throws Exception
{
- assertEquals("a", evaluate("#set($v = \"\\u0061\")$v"));
+ assertEvalEquals("a", "#set($v = \"\\u0061\")$v");
}
private void assertUnescape(String expected, String escaped)
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/VarargMethodsTestCase.java
Wed Feb 4 23:54:43 2009
@@ -25,14 +25,14 @@
/**
* Used to check that vararg method calls on references work properly
*/
-public class VarargMethodsTestCase extends BaseEvalTestCase
+public class VarargMethodsTestCase extends BaseTestCase
{
public VarargMethodsTestCase(final String name)
{
super(name);
}
- protected void setContext(VelocityContext context)
+ protected void setUpContext(VelocityContext context)
{
context.put("nice", new NiceTool());
context.put("nasty", new NastyTool());
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity355And552TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-355 and its twin, VELOCITY-552.
*/
-public class Velocity355And552TestCase extends BaseEvalTestCase
+public class Velocity355And552TestCase extends BaseTestCase
{
public Velocity355And552TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity532TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity532TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity532TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity532TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-532.
*/
-public class Velocity532TestCase extends BaseEvalTestCase
+public class Velocity532TestCase extends BaseTestCase
{
public Velocity532TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity544TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity544TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity544TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity544TestCase.java
Wed Feb 4 23:54:43 2009
@@ -22,13 +22,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* @see https://issues.apache.org/jira/browse/VELOCITY-544
*/
public class Velocity544TestCase
- extends BaseEvalTestCase
+ extends BaseTestCase
{
public Velocity544TestCase(final String name)
throws Exception
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity579TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity579TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity579TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity579TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-579 and with some related stuff
* from VELOCITY-70 thrown in.
*/
-public class Velocity579TestCase extends BaseEvalTestCase
+public class Velocity579TestCase extends BaseTestCase
{
public Velocity579TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity587TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity587TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity587TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity587TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-587.
*/
-public class Velocity587TestCase extends BaseEvalTestCase
+public class Velocity587TestCase extends BaseTestCase
{
public Velocity587TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity589TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity589TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity589TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity589TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-589.
*/
-public class Velocity589TestCase extends BaseEvalTestCase
+public class Velocity589TestCase extends BaseTestCase
{
public Velocity589TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity614TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity614TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity614TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity614TestCase.java
Wed Feb 4 23:54:43 2009
@@ -21,12 +21,12 @@
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.TemplateInitException;
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-614.
*/
-public class Velocity614TestCase extends BaseEvalTestCase
+public class Velocity614TestCase extends BaseTestCase
{
public Velocity614TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity615TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-615.
*/
-public class Velocity615TestCase extends BaseEvalTestCase
+public class Velocity615TestCase extends BaseTestCase
{
public Velocity615TestCase(String name)
{
@@ -112,6 +112,16 @@
assertEvalEquals("012", template);
}
+ public void testVelocity681()
+ {
+ String template = "#macro(myMacro $result)"+
+ " #set($result = 'some value')"+
+ "#end"+
+ "#myMacro($x)"+
+ "$x";
+ assertEvalEquals("$x", template);
+ }
+
public static class Inc
{
private int i=0;
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity616TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity616TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity616TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity616TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,12 +19,12 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
/**
* This class tests VELOCITY-616.
*/
-public class Velocity616TestCase extends BaseEvalTestCase
+public class Velocity616TestCase extends BaseTestCase
{
public Velocity616TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity625TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-625.
*/
-public class Velocity625TestCase extends BaseEvalTestCase
+public class Velocity625TestCase extends BaseTestCase
{
public Velocity625TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
@@ -27,7 +27,7 @@
* Error message reports correct line numbers.
*/
-public class Velocity627TestCase extends BaseEvalTestCase
+public class Velocity627TestCase extends BaseTestCase
{
public Velocity627TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity629TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-629. Make sure string literals
* Error message reports correct line and column numbers.
*/
-public class Velocity629TestCase extends BaseEvalTestCase
+public class Velocity629TestCase extends BaseTestCase
{
public Velocity629TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity62TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-62.
*/
-public class Velocity62TestCase extends BaseEvalTestCase
+public class Velocity62TestCase extends BaseTestCase
{
public Velocity62TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity630TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity630TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity630TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity630TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-630.
*/
-public class Velocity630TestCase extends BaseEvalTestCase
+public class Velocity630TestCase extends BaseTestCase
{
public Velocity630TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity631TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-631.
*/
-public class Velocity631TestCase extends BaseEvalTestCase
+public class Velocity631TestCase extends BaseTestCase
{
public Velocity631TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity644TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity644TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity644TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity644TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,14 +19,14 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-644. Make sure the reported filename
* is correct in exceptions when an error occurs in another template file.
*/
-public class Velocity644TestCase extends BaseEvalTestCase
+public class Velocity644TestCase extends BaseTestCase
{
public Velocity644TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity667TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-667. Make "#macro" throws a parse exception
*/
-public class Velocity667TestCase extends BaseEvalTestCase
+public class Velocity667TestCase extends BaseTestCase
{
public Velocity667TestCase(String name)
{
Modified:
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java?rev=740939&r1=740938&r2=740939&view=diff
==============================================================================
---
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
(original)
+++
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity682TestCase.java
Wed Feb 4 23:54:43 2009
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.velocity.test.BaseEvalTestCase;
+import org.apache.velocity.test.BaseTestCase;
import org.apache.velocity.runtime.RuntimeConstants;
/**
* This class tests VELOCITY-682.
*/
-public class Velocity682TestCase extends BaseEvalTestCase
+public class Velocity682TestCase extends BaseTestCase
{
public Velocity682TestCase(String name)
{
