jvanzyl 00/11/03 18:41:58
Modified: src/java/org/apache/velocity/test TemplateTestCase.java
src/java/org/apache/velocity/test/misc Test.java
Log:
- getting rid of references to Tea.
Revision Changes Path
1.16 +5 -15
jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java
Index: TemplateTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/TemplateTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TemplateTestCase.java 2000/11/03 23:26:51 1.15
+++ TemplateTestCase.java 2000/11/04 02:41:57 1.16
@@ -73,7 +73,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: TemplateTestCase.java,v 1.15 2000/11/03 23:26:51 jon Exp $
+ * @version $Id: TemplateTestCase.java,v 1.16 2000/11/04 02:41:57 jvanzyl Exp $
*/
public class TemplateTestCase extends RuntimeTestCase
{
@@ -162,24 +162,14 @@
FileOutputStream fos =
new FileOutputStream (getFileName(RESULT_DIR, baseFileName,
RESULT_FILE_EXT));
- // create the streams
- InternedCharToByteBuffer ictbb = new InternedCharToByteBuffer(
- new DefaultCharToByteBuffer(new DefaultByteBuffer(),
Runtime.getString(
- Runtime.TEMPLATE_ENCODING)));
- // create the writer
- CharToByteBufferWriter buffer = new CharToByteBufferWriter (ictbb);
+ Writer writer = new BufferedWriter(new OutputStreamWriter(fos));
// process the template
- template.merge(context, buffer);
+ template.merge(context, writer);
- // write the output to the file
- ictbb.writeTo(fos);
-
- // close the buffer
- buffer.close();
-
// close the file
- fos.close();
+ writer.flush();
+ writer.close();
if (!isMatch())
{
1.3 +7 -11
jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java
Index: Test.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/misc/Test.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Test.java 2000/11/03 23:26:52 1.2
+++ Test.java 2000/11/04 02:41:57 1.3
@@ -71,12 +71,13 @@
* test all the directives support by Velocity.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Test.java,v 1.2 2000/11/03 23:26:52 jon Exp $
+ * @version $Id: Test.java,v 1.3 2000/11/04 02:41:57 jvanzyl Exp $
*/
public class Test
{
public Test(String templateFile)
{
+ Writer writer = null;
TestProvider provider = new TestProvider();
ArrayList al = provider.getCustomers();
Hashtable h = new Hashtable();
@@ -102,16 +103,11 @@
context.put("menu", provider.getMenu());
context.put("stringarray", provider.getArray());
- // create the output buffer
- InternedCharToByteBuffer ictbb = new InternedCharToByteBuffer(
- new DefaultCharToByteBuffer(new DefaultByteBuffer(),
Runtime.getString(
- Runtime.TEMPLATE_ENCODING)));
- CharToByteBufferWriter buffer = new CharToByteBufferWriter (ictbb);
- template.merge(context, buffer);
- // write the buffer to the output stream
- ictbb.writeTo(System.out);
- ictbb.reset(); // calling this doesn't really have an effect
- buffer.close();
+ writer = new BufferedWriter(new OutputStreamWriter(System.out));
+ template.merge(context, writer);
+
+ writer.flush();
+ writer.close();
}
catch( Exception e )
{
