From f866ec283d54d16c45dce9817b126060fd908155 Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 10 Nov 2006 20:36:42 +0000 Subject: [PATCH] Small fiddling. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1973 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/velocity/VelocityTestCase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/samskivert/velocity/VelocityTestCase.java b/src/java/com/samskivert/velocity/VelocityTestCase.java index 8d9d5a5c..42a62c44 100644 --- a/src/java/com/samskivert/velocity/VelocityTestCase.java +++ b/src/java/com/samskivert/velocity/VelocityTestCase.java @@ -22,8 +22,10 @@ package com.samskivert.velocity; import java.io.File; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.Collection; import java.util.Locale; import junit.framework.TestCase; @@ -97,7 +99,7 @@ public abstract class VelocityTestCase extends TestCase // parse the template if (!_engine.evaluate(new VelocityContext(), new StringWriter(), - template, tempin)) { + template, new InputStreamReader(tempin))) { fail("Template parsing failed '" + template + "'."); } } @@ -165,7 +167,7 @@ public abstract class VelocityTestCase extends TestCase * Returns an array of template paths which will be resolved on the * classpath. */ - protected abstract String[] getTemplates (); + protected abstract Collection getTemplates (); /** Accumulates logging to a buffer for later reporting. */ protected LogChute _logger = new LogChute() {