dlr 00/10/14 20:21:42
Modified: src/java/org/apache/velocity/test VelocityTest.java
VelocityTestSuite.java
Added: src/java/org/apache/velocity/test BaseTestCase.java
Log:
Added test case base class to house functionality needed by most test cases.
Revision Changes Path
1.2 +7 -25
jakarta-velocity/src/java/org/apache/velocity/test/VelocityTest.java
Index: VelocityTest.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/VelocityTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityTest.java 2000/10/11 06:46:27 1.1
+++ VelocityTest.java 2000/10/15 03:21:41 1.2
@@ -56,32 +56,24 @@
import junit.framework.*;
-import java.io.FileWriter;
-import java.io.FileOutputStream;
-
import java.util.ArrayList;
import java.util.Hashtable;
-import org.apache.velocity.io.FastWriter;
-
import org.apache.velocity.Context;
import org.apache.velocity.Template;
-
import org.apache.velocity.runtime.Runtime;
/**
- * Automated test for the Apache Velocity.
+ * Automated test case for Apache Velocity.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
- * @version $Id: VelocityTest.java,v 1.1 2000/10/11 06:46:27 dlr Exp $
+ * @version $Id: VelocityTest.java,v 1.2 2000/10/15 03:21:41 dlr Exp $
*/
-public class VelocityTest extends TestCase
+public class VelocityTest extends BaseTestCase
{
/**
- * The properties file name of the application.
+ * The name of the test case's template file.
*/
- private static final String PROPS_FILE_NAME = "velocity.properties";
-
private static final String TEMPLATE_FILE_NAME = "test.vm";
private TestProvider provider;
@@ -107,7 +99,7 @@
*/
public static junit.framework.Test suite ()
{
- return new VelocityTestSuite();
+ return BaseTestCase.suite();
}
/**
@@ -125,9 +117,6 @@
{
try
{
- Runtime.init(PROPS_FILE_NAME);
- Template template = Runtime.getTemplate(TEMPLATE_FILE_NAME);
-
Context context = new Context();
context.put("provider", provider);
context.put("name", "jason");
@@ -138,16 +127,9 @@
context.put("search", provider.getSearch());
context.put("relatedSearches", provider.getRelSearches());
context.put("searchResults", provider.getRelSearches());
-
- FastWriter fw = new FastWriter
- (System.out, Runtime.getString(Runtime.TEMPLATE_ENCODING));
-
- fw.setAsciiHack(Runtime.getBoolean(Runtime.TEMPLATE_ASCIIHACK));
-
- template.merge(context, fw);
- fw.flush();
- fw.close();
+ Template template = Runtime.getTemplate(TEMPLATE_FILE_NAME);
+ template.merge(context, getWriter(System.out));
}
catch (Exception e)
{
1.2 +3 -1
jakarta-velocity/src/java/org/apache/velocity/test/VelocityTestSuite.java
Index: VelocityTestSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/VelocityTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VelocityTestSuite.java 2000/10/11 06:46:27 1.1
+++ VelocityTestSuite.java 2000/10/15 03:21:41 1.2
@@ -60,7 +60,7 @@
* Test suite for Apache Velocity.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
- * @version $Id: VelocityTestSuite.java,v 1.1 2000/10/11 06:46:27 dlr Exp $
+ * @version $Id: VelocityTestSuite.java,v 1.2 2000/10/15 03:21:41 dlr Exp $
*/
public class VelocityTestSuite extends TestSuite
{
@@ -70,6 +70,8 @@
public VelocityTestSuite ()
{
super("Apache Velocity test suite");
+
+ // Add test cases here.
addTest(new VelocityTest("Apache Velocity"));
}
}
1.1
jakarta-velocity/src/java/org/apache/velocity/test/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
package org.apache.velocity.test;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.io.*;
import junit.framework.*;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.io.FastWriter;
/**
* Base functionality to be extended by all Apache Velocity test cases. Test
* case implementations are used to automatate testing via JUnit.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
* @version $Id: BaseTestCase.java,v 1.1 2000/10/15 03:21:41 dlr Exp $
*/
abstract class BaseTestCase extends TestCase
{
/**
* The properties file name of the application.
*/
private static final String PROPS_FILE_NAME = "velocity.properties";
/**
* The writer used to output evaluated templates.
*/
private FastWriter writer;
/**
* Creates a new instance.
*/
public BaseTestCase (String name)
{
super(name);
try
{
Runtime.init(PROPS_FILE_NAME);
}
catch (Exception e)
{
fail(e.getMessage());
}
}
/**
* Get the containing <code>TestSuite</code>. This is always
* <code>VelocityTestSuite</code>.
*
* @return The <code>TestSuite</code> to run.
*/
public static junit.framework.Test suite ()
{
return new VelocityTestSuite();
}
/**
* Performs cleanup activities for this test case.
*/
protected void tearDown ()
{
try
{
closeWriter();
}
catch (IOException e)
{
fail(e.getMessage());
}
}
/**
* Returns a <code>FastWriter</code> instance.
*
* @param out The output stream for the writer to write to. If
* <code>null</code>, defaults to <code>System.out</code>.
* @return The writer.
*/
protected Writer getWriter (OutputStream out)
throws UnsupportedEncodingException, IOException
{
if (writer == null)
{
if (out == null)
{
out = System.out;
}
writer = new FastWriter
(out, Runtime.getString(Runtime.TEMPLATE_ENCODING));
writer.setAsciiHack
(Runtime.getBoolean(Runtime.TEMPLATE_ASCIIHACK));
}
return writer;
}
/**
* Closes the writer (if it has been opened).
*/
protected void closeWriter ()
throws IOException
{
if (writer != null)
{
writer.flush();
writer.close();
}
}
}
